From 4c93a1271b8aea159cf53f8d7879b00513886d6f Mon Sep 17 00:00:00 2001 From: zman Date: Fri, 7 Feb 2025 20:29:39 -0500 Subject: [PATCH] q --- Dockerfile | 13 ++ alembic.ini | 119 ++++++++++++++++++ alembic/README | 1 + alembic/env.py | 90 +++++++++++++ alembic/script.py.mako | 26 ++++ alembic/versions/f629adc7e597_.py | 30 +++++ __init__.py => app/__init__.py | 0 {db => app/db}/__init__.py | 0 {db => app/db}/database.py | 0 {db => app/db}/models.py | 24 ++-- {db => app/db}/utils.py | 0 dependencies.py => app/dependencies.py | 0 exceptions.py => app/exceptions.py | 0 main.py => app/main.py | 0 {routes => app/routes}/__init__.py | 0 {routes => app/routes}/routes.py | 0 {schemas => app/schemas}/__init__.py | 0 {schemas => app/schemas}/base.py | 0 {schemas => app/schemas}/box.py | 0 {schemas => app/schemas}/file.py | 0 {schemas => app/schemas}/inventory.py | 0 {schemas => app/schemas}/order.py | 0 {services => app/services}/__init__.py | 0 {services => app/services}/box.py | 0 {services => app/services}/file.py | 2 +- {services => app/services}/inventory.py | 0 {services => app/services}/pricing.py | 0 {services => app/services}/product.py | 0 {services => app/services}/storage.py | 0 {services => app/services}/task.py | 2 +- {services => app/services}/tcgplayer.py | 2 +- {services => app/services}/unholy_pricing.py | 0 {services => app/services}/util/_dataframe.py | 0 {tests => app/tests}/box_test.py | 0 {tests => app/tests}/file_test.py | 0 .../tests}/test_files/manabox_test_file.csv | 0 pytest.ini | 2 +- 37 files changed, 295 insertions(+), 16 deletions(-) create mode 100644 Dockerfile create mode 100644 alembic.ini create mode 100644 alembic/README create mode 100644 alembic/env.py create mode 100644 alembic/script.py.mako create mode 100644 alembic/versions/f629adc7e597_.py rename __init__.py => app/__init__.py (100%) rename {db => app/db}/__init__.py (100%) rename {db => app/db}/database.py (100%) rename {db => app/db}/models.py (95%) rename {db => app/db}/utils.py (100%) rename dependencies.py => app/dependencies.py (100%) rename exceptions.py => app/exceptions.py (100%) rename main.py => app/main.py (100%) rename {routes => app/routes}/__init__.py (100%) rename {routes => app/routes}/routes.py (100%) rename {schemas => app/schemas}/__init__.py (100%) rename {schemas => app/schemas}/base.py (100%) rename {schemas => app/schemas}/box.py (100%) rename {schemas => app/schemas}/file.py (100%) rename {schemas => app/schemas}/inventory.py (100%) rename {schemas => app/schemas}/order.py (100%) rename {services => app/services}/__init__.py (100%) rename {services => app/services}/box.py (100%) rename {services => app/services}/file.py (99%) rename {services => app/services}/inventory.py (100%) rename {services => app/services}/pricing.py (100%) rename {services => app/services}/product.py (100%) rename {services => app/services}/storage.py (100%) rename {services => app/services}/task.py (99%) rename {services => app/services}/tcgplayer.py (99%) rename {services => app/services}/unholy_pricing.py (100%) rename {services => app/services}/util/_dataframe.py (100%) rename {tests => app/tests}/box_test.py (100%) rename {tests => app/tests}/file_test.py (100%) rename {tests => app/tests}/test_files/manabox_test_file.csv (100%) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..362ea20 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM python:3.9-slim + +WORKDIR /app + +COPY requirements.txt . + +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +EXPOSE 8000 + +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 0000000..f443122 --- /dev/null +++ b/alembic.ini @@ -0,0 +1,119 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +# Use forward slashes (/) also on windows to provide an os agnostic path +script_location = alembic + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. +prepend_sys_path = . + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library. +# Any required deps can installed by adding `alembic[tz]` to the pip requirements +# string value is passed to ZoneInfo() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to alembic/versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "version_path_separator" below. +# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions + +# version path separator; As mentioned above, this is the character used to split +# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. +# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. +# Valid values for version_path_separator are: +# +# version_path_separator = : +# version_path_separator = ; +# version_path_separator = space +# version_path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +version_path_separator = os + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +sqlalchemy.url = sqlite:///omegacard.db + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# lint with attempts to fix using "ruff" - use the exec runner, execute a binary +# hooks = ruff +# ruff.type = exec +# ruff.executable = %(here)s/.venv/bin/ruff +# ruff.options = --fix REVISION_SCRIPT_FILENAME + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/alembic/README b/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py new file mode 100644 index 0000000..2f485f3 --- /dev/null +++ b/alembic/env.py @@ -0,0 +1,90 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +import sys +import os + +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) + +from db.models import Base +from db.database import DATABASE_URL + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +config.set_main_option('sqlalchemy.url', DATABASE_URL) + + + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = Base.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako new file mode 100644 index 0000000..fbc4b07 --- /dev/null +++ b/alembic/script.py.mako @@ -0,0 +1,26 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + ${downgrades if downgrades else "pass"} diff --git a/alembic/versions/f629adc7e597_.py b/alembic/versions/f629adc7e597_.py new file mode 100644 index 0000000..41e317e --- /dev/null +++ b/alembic/versions/f629adc7e597_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: f629adc7e597 +Revises: +Create Date: 2025-02-07 20:13:32.559672 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'f629adc7e597' +down_revision: Union[str, None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/__init__.py b/app/__init__.py similarity index 100% rename from __init__.py rename to app/__init__.py diff --git a/db/__init__.py b/app/db/__init__.py similarity index 100% rename from db/__init__.py rename to app/db/__init__.py diff --git a/db/database.py b/app/db/database.py similarity index 100% rename from db/database.py rename to app/db/database.py diff --git a/db/models.py b/app/db/models.py similarity index 95% rename from db/models.py rename to app/db/models.py index 05fc334..cf785bf 100644 --- a/db/models.py +++ b/app/db/models.py @@ -132,7 +132,7 @@ class Card(Base): date_modified = Column(DateTime, default=datetime.now, onupdate=datetime.now) class CardManabox(Base): - __tablename__ = "card_manabox" + __tablename__ = "manabox_cards" product_id = Column(String, ForeignKey("cards.product_id"), primary_key=True) name = Column(String) @@ -147,7 +147,7 @@ class CardManabox(Base): language = Column(String) class CardTCGPlayer(Base): - __tablename__ = "card_tcgplayer" + __tablename__ = "tcgplayer_cards" product_id = Column(String, ForeignKey("cards.product_id"), primary_key=True) group_id = Column(Integer, ForeignKey("tcgplayer_groups.group_id")) @@ -164,7 +164,7 @@ class Warehouse(Base): """ container that is associated with a user and contains inventory and stock """ - __tablename__ = "warehouse" + __tablename__ = "warehouses" id = Column(String, primary_key=True) user_id = Column(String, ForeignKey("users.id")) @@ -175,10 +175,10 @@ class Stock(Base): """ contains products that are listed for sale """ - __tablename__ = "stock" + __tablename__ = "stocks" product_id = Column(String, ForeignKey("products.id"), primary_key=True) - warehouse_id = Column(String, ForeignKey("warehouse.id"), default="default") + warehouse_id = Column(String, ForeignKey("warehouses.id"), default="default") marketplace_id = Column(String, ForeignKey("marketplaces.id")) quantity = Column(Integer) date_created = Column(DateTime, default=datetime.now) @@ -190,10 +190,10 @@ class Inventory(Base): sealed product in breakdown queue, held sealed product, speculatively held singles, etc. inventory can contain products across multiple marketplaces """ - __tablename__ = "inventory" + __tablename__ = "inventories" product_id = Column(String, ForeignKey("products.id"), primary_key=True) - warehouse_id = Column(String, ForeignKey("warehouse.id"), default="default") + warehouse_id = Column(String, ForeignKey("warehouses.id"), default="default") quantity = Column(Integer) date_created = Column(DateTime, default=datetime.now) date_modified = Column(DateTime, default=datetime.now, onupdate=datetime.now) @@ -248,7 +248,7 @@ class File(Base): date_modified = Column(DateTime, default=datetime.now, onupdate=datetime.now) class Price(Base): - __tablename__ = "price" + __tablename__ = "prices" id = Column(String, primary_key=True) product_id = Column(String, ForeignKey("products.id")) @@ -271,7 +271,7 @@ class StorageBlock(Base): return type id = Column(String, primary_key=True) - warehouse_id = Column(String, ForeignKey("warehouse.id")) + warehouse_id = Column(String, ForeignKey("warehouses.id")) name = Column(String) type = Column(String) # rare or common date_created = Column(DateTime, default=datetime.now) @@ -282,7 +282,7 @@ class ProductBlock(Base): ProductBlock represents the relationship between a product and a storage block which products are in a block and at what index """ - __tablename__ = "product_block" + __tablename__ = "product_blocks" id = Column(String, primary_key=True) product_id = Column(String, ForeignKey("products.id")) @@ -295,7 +295,7 @@ class OpenBoxCard(Base): """ OpenedBoxCard represents the relationship between an opened box and the cards it contains """ - __tablename__ = "open_box_card" + __tablename__ = "open_box_cards" id = Column(String, primary_key=True) open_box_id = Column(String, ForeignKey("open_boxes.id")) @@ -308,7 +308,7 @@ class ProductSale(Base): """ ProductSale represents the relationship between products and sales """ - __tablename__ = "product_sale" + __tablename__ = "product_sales" id = Column(String, primary_key=True) product_id = Column(String, ForeignKey("products.id")) diff --git a/db/utils.py b/app/db/utils.py similarity index 100% rename from db/utils.py rename to app/db/utils.py diff --git a/dependencies.py b/app/dependencies.py similarity index 100% rename from dependencies.py rename to app/dependencies.py diff --git a/exceptions.py b/app/exceptions.py similarity index 100% rename from exceptions.py rename to app/exceptions.py diff --git a/main.py b/app/main.py similarity index 100% rename from main.py rename to app/main.py diff --git a/routes/__init__.py b/app/routes/__init__.py similarity index 100% rename from routes/__init__.py rename to app/routes/__init__.py diff --git a/routes/routes.py b/app/routes/routes.py similarity index 100% rename from routes/routes.py rename to app/routes/routes.py diff --git a/schemas/__init__.py b/app/schemas/__init__.py similarity index 100% rename from schemas/__init__.py rename to app/schemas/__init__.py diff --git a/schemas/base.py b/app/schemas/base.py similarity index 100% rename from schemas/base.py rename to app/schemas/base.py diff --git a/schemas/box.py b/app/schemas/box.py similarity index 100% rename from schemas/box.py rename to app/schemas/box.py diff --git a/schemas/file.py b/app/schemas/file.py similarity index 100% rename from schemas/file.py rename to app/schemas/file.py diff --git a/schemas/inventory.py b/app/schemas/inventory.py similarity index 100% rename from schemas/inventory.py rename to app/schemas/inventory.py diff --git a/schemas/order.py b/app/schemas/order.py similarity index 100% rename from schemas/order.py rename to app/schemas/order.py diff --git a/services/__init__.py b/app/services/__init__.py similarity index 100% rename from services/__init__.py rename to app/services/__init__.py diff --git a/services/box.py b/app/services/box.py similarity index 100% rename from services/box.py rename to app/services/box.py diff --git a/services/file.py b/app/services/file.py similarity index 99% rename from services/file.py rename to app/services/file.py index 2f04eff..8a2c8d4 100644 --- a/services/file.py +++ b/app/services/file.py @@ -14,7 +14,7 @@ logger = logging.getLogger(__name__) class FileConfig: """Configuration constants for file processing""" - TEMP_DIR = os.path.join(os.getcwd(), 'temp') + TEMP_DIR = os.path.join(os.getcwd(), 'app/' + 'temp') MANABOX_HEADERS = [ 'Name', 'Set code', 'Set name', 'Collector number', 'Foil', diff --git a/services/inventory.py b/app/services/inventory.py similarity index 100% rename from services/inventory.py rename to app/services/inventory.py diff --git a/services/pricing.py b/app/services/pricing.py similarity index 100% rename from services/pricing.py rename to app/services/pricing.py diff --git a/services/product.py b/app/services/product.py similarity index 100% rename from services/product.py rename to app/services/product.py diff --git a/services/storage.py b/app/services/storage.py similarity index 100% rename from services/storage.py rename to app/services/storage.py diff --git a/services/task.py b/app/services/task.py similarity index 99% rename from services/task.py rename to app/services/task.py index b265a19..4c15fad 100644 --- a/services/task.py +++ b/app/services/task.py @@ -23,7 +23,7 @@ class TaskService: # self.pricing_service.generate_tcgplayer_inventory_update_file_with_pricing(['e20cc342-23cb-4593-89cb-56a0cb3ed3f3']) def register_scheduled_tasks(self): - self.scheduler.add_job(self.hourly_pricing, 'cron', minute='0') + self.scheduler.add_job(self.hourly_pricing, 'cron', minute='45') self.logger.info("Scheduled tasks registered.") def hourly_pricing(self): diff --git a/services/tcgplayer.py b/app/services/tcgplayer.py similarity index 99% rename from services/tcgplayer.py rename to app/services/tcgplayer.py index 4e74b23..cb231d1 100644 --- a/services/tcgplayer.py +++ b/app/services/tcgplayer.py @@ -459,7 +459,7 @@ class TCGPlayerService: def get_pricing_export_for_all_products(self) -> File: """ """ - DEBUG = True + DEBUG = False if DEBUG: logger.debug("DEBUG: Using existing pricing export file") file = self.db.query(File).filter(File.type == 'tcgplayer_pricing_export').first() diff --git a/services/unholy_pricing.py b/app/services/unholy_pricing.py similarity index 100% rename from services/unholy_pricing.py rename to app/services/unholy_pricing.py diff --git a/services/util/_dataframe.py b/app/services/util/_dataframe.py similarity index 100% rename from services/util/_dataframe.py rename to app/services/util/_dataframe.py diff --git a/tests/box_test.py b/app/tests/box_test.py similarity index 100% rename from tests/box_test.py rename to app/tests/box_test.py diff --git a/tests/file_test.py b/app/tests/file_test.py similarity index 100% rename from tests/file_test.py rename to app/tests/file_test.py diff --git a/tests/test_files/manabox_test_file.csv b/app/tests/test_files/manabox_test_file.csv similarity index 100% rename from tests/test_files/manabox_test_file.csv rename to app/tests/test_files/manabox_test_file.csv diff --git a/pytest.ini b/pytest.ini index 03f586d..8a00158 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,2 @@ [pytest] -pythonpath = . \ No newline at end of file +pythonpath = ./app \ No newline at end of file