diff --git a/db/__pycache__/__init__.cpython-310.pyc b/db/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 371f42c..0000000 Binary files a/db/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/db/__pycache__/__init__.cpython-311.pyc b/db/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 323da01..0000000 Binary files a/db/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/db/__pycache__/base.cpython-310.pyc b/db/__pycache__/base.cpython-310.pyc deleted file mode 100644 index 8db6a2d..0000000 Binary files a/db/__pycache__/base.cpython-310.pyc and /dev/null differ diff --git a/db/__pycache__/base.cpython-311.pyc b/db/__pycache__/base.cpython-311.pyc deleted file mode 100644 index 968c5ef..0000000 Binary files a/db/__pycache__/base.cpython-311.pyc and /dev/null differ diff --git a/db/__pycache__/session.cpython-310.pyc b/db/__pycache__/session.cpython-310.pyc deleted file mode 100644 index 431ef68..0000000 Binary files a/db/__pycache__/session.cpython-310.pyc and /dev/null differ diff --git a/db/__pycache__/session.cpython-311.pyc b/db/__pycache__/session.cpython-311.pyc deleted file mode 100644 index 0472c22..0000000 Binary files a/db/__pycache__/session.cpython-311.pyc and /dev/null differ diff --git a/db/models/__pycache__/__init__.cpython-310.pyc b/db/models/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index af1de00..0000000 Binary files a/db/models/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/db/models/__pycache__/__init__.cpython-311.pyc b/db/models/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 95c4f00..0000000 Binary files a/db/models/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/db/models/__pycache__/base.cpython-310.pyc b/db/models/__pycache__/base.cpython-310.pyc deleted file mode 100644 index 8da9105..0000000 Binary files a/db/models/__pycache__/base.cpython-310.pyc and /dev/null differ diff --git a/db/models/__pycache__/base.cpython-311.pyc b/db/models/__pycache__/base.cpython-311.pyc deleted file mode 100644 index 5fe8a54..0000000 Binary files a/db/models/__pycache__/base.cpython-311.pyc and /dev/null differ diff --git a/db/models/__pycache__/log_data_model.cpython-310.pyc b/db/models/__pycache__/log_data_model.cpython-310.pyc deleted file mode 100644 index 57b5a10..0000000 Binary files a/db/models/__pycache__/log_data_model.cpython-310.pyc and /dev/null differ diff --git a/db/models/__pycache__/log_data_model.cpython-311.pyc b/db/models/__pycache__/log_data_model.cpython-311.pyc deleted file mode 100644 index bb82ddd..0000000 Binary files a/db/models/__pycache__/log_data_model.cpython-311.pyc and /dev/null differ diff --git a/db/repository/__pycache__/__init__.cpython-310.pyc b/db/repository/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 0822d04..0000000 Binary files a/db/repository/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/db/repository/__pycache__/__init__.cpython-311.pyc b/db/repository/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 0b2b350..0000000 Binary files a/db/repository/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/db/repository/__pycache__/lot_data_repository.cpython-310.pyc b/db/repository/__pycache__/lot_data_repository.cpython-310.pyc deleted file mode 100644 index 0fbcd7a..0000000 Binary files a/db/repository/__pycache__/lot_data_repository.cpython-310.pyc and /dev/null differ diff --git a/db/repository/__pycache__/lot_data_repository.cpython-311.pyc b/db/repository/__pycache__/lot_data_repository.cpython-311.pyc deleted file mode 100644 index 36428cf..0000000 Binary files a/db/repository/__pycache__/lot_data_repository.cpython-311.pyc and /dev/null differ diff --git a/db/__init__.py b/src/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from db/__init__.py rename to src/__init__.py diff --git a/db/models/__init__.py b/src/db/__init__.py similarity index 100% rename from db/models/__init__.py rename to src/db/__init__.py diff --git a/db/api.py b/src/db/api.py similarity index 65% rename from db/api.py rename to src/db/api.py index 9d42af0..fe47791 100644 --- a/db/api.py +++ b/src/db/api.py @@ -1,12 +1,6 @@ -import os -import subprocess - -import uvicorn -from db.models.base import BaseResponse -from db.models.log_data_model import LOT_DATA, LOT_DATA_MODEL -from db.repository import add_kb_to_db, get_kb_detail, get_kb_detail_by_time, delete_kb_detail_by_time - -from fastapi import FastAPI +from src.db.models.base import BaseResponse +from src.db.models.log_data_model import LOT_DATA +from src.db.repository import add_kb_to_db, get_kb_detail, delete_kb_detail_by_time def add(data: LOT_DATA): diff --git a/db/base.py b/src/db/base.py similarity index 100% rename from db/base.py rename to src/db/base.py diff --git a/src/db/models/__init__.py b/src/db/models/__init__.py new file mode 100755 index 0000000..e69de29 diff --git a/db/models/base.py b/src/db/models/base.py similarity index 85% rename from db/models/base.py rename to src/db/models/base.py index 43c821d..9b15a03 100755 --- a/db/models/base.py +++ b/src/db/models/base.py @@ -1,12 +1,9 @@ from datetime import datetime -from typing import Any, List +from typing import Any -import pydantic from pydantic import BaseModel from sqlalchemy import Column, DateTime, String, Integer -from db.models.log_data_model import LOT_DATA_MODEL, LOT_DATA - class BaseResponse(BaseModel): code: int = 200 diff --git a/db/models/log_data_model.py b/src/db/models/log_data_model.py similarity index 99% rename from db/models/log_data_model.py rename to src/db/models/log_data_model.py index e99e179..2a23712 100755 --- a/db/models/log_data_model.py +++ b/src/db/models/log_data_model.py @@ -1,6 +1,6 @@ from pydantic import BaseModel, Field from sqlalchemy import * -from db.base import Base +from src.db.base import Base class LOT_DATA(BaseModel): diff --git a/db/repository/__init__.py b/src/db/repository/__init__.py similarity index 100% rename from db/repository/__init__.py rename to src/db/repository/__init__.py diff --git a/db/repository/lot_data_repository.py b/src/db/repository/lot_data_repository.py similarity index 92% rename from db/repository/lot_data_repository.py rename to src/db/repository/lot_data_repository.py index e3c5ea7..dc236f8 100755 --- a/db/repository/lot_data_repository.py +++ b/src/db/repository/lot_data_repository.py @@ -1,7 +1,5 @@ -import time - -from db.models.log_data_model import LOT_DATA_MODEL, LOT_DATA -from db.session import with_session +from src.db.models.log_data_model import LOT_DATA_MODEL, LOT_DATA +from src.db.session import with_session @with_session diff --git a/db/session.py b/src/db/session.py similarity index 96% rename from db/session.py rename to src/db/session.py index 47cb59f..78b04d0 100755 --- a/db/session.py +++ b/src/db/session.py @@ -1,6 +1,6 @@ from functools import wraps from contextlib import contextmanager -from db.base import SessionLocal +from src.db.base import SessionLocal from sqlalchemy.orm import Session