diff --git a/.env.example b/.env.example index aa29e76..9ae11c3 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,5 @@ GEMINI_API_KEY=your_api_key_here -GEMINI_MODEL=gemini-2.0-flash +GEMINI_MODEL=gemini-2.5-flash OPENAI_API_KEY=your_openai_api_key_here OPENAI_MODEL=gpt-4o @@ -8,3 +8,4 @@ OPENROUTER_API_KEY=your_openrouter_api_key_here OPENROUTER_MODEL=anthropic/claude-3.5-sonnet MCP_SERVER_URL=http://localhost:8003/mcp +DATABASE_URL=sqlite:///./Database.db diff --git a/.gitignore b/.gitignore index 1ac7e7d..7aab840 100644 --- a/.gitignore +++ b/.gitignore @@ -1,164 +1,165 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -.idea/ -.DS_Store -.ruff_cache -.zed -Database.db +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +.idea/ +.DS_Store +.ruff_cache +.zed +Database.db +.vs/ diff --git a/app/api/task_handler.py b/app/api/task_handler.py index 44494ff..fcfb30d 100644 --- a/app/api/task_handler.py +++ b/app/api/task_handler.py @@ -48,7 +48,7 @@ def add_task_to_db(cls, db: Session, task: PLTask): if not new_task_obj: raise Exception("No new task obj") - task.id = new_task_obj.id + task.id = new_task_obj.id # ty: ignore return task @@ -112,8 +112,8 @@ def complete_task(cls, db: Session, task: PLTask): if dbtask: try: - dbtask.completed = True - dbtask.task_ended = task.task_ended + dbtask.completed = True # ty: ignore + dbtask.task_ended = task.task_ended # ty: ignore db.commit() return task diff --git a/app/llm/base.py b/app/llm/base.py index 4325281..2202db6 100644 --- a/app/llm/base.py +++ b/app/llm/base.py @@ -43,7 +43,7 @@ class BaseLLMClient(Protocol): @property def provider_name(self) -> str: - """Returns the human-readable name of the LLM provider.""" + """Human-readable name of the LLM provider.""" ... async def generate(self, request: LLMRequest) -> LLMResponse: diff --git a/app/llm/core/queue.py b/app/llm/core/queue.py index c010256..5aaf4d6 100644 --- a/app/llm/core/queue.py +++ b/app/llm/core/queue.py @@ -144,7 +144,7 @@ async def wait_for_result( if isinstance(job, FinishedJob): outcome = job.outcome if outcome.status == "ok": - return cast(LLMResponse, outcome.root) # ty: ignore + return cast(LLMResponse, outcome.root) raise ValueError(f"Job failed: {outcome.root}") if anyio.current_time() > deadline: raise TimeoutError(f"Job {job_id} did not complete within {timeout}s") diff --git a/app/services/database.py b/app/services/database.py index 1a1da30..b4acd7a 100644 --- a/app/services/database.py +++ b/app/services/database.py @@ -1,8 +1,16 @@ +from __future__ import annotations + +import os +from typing import TYPE_CHECKING + from fastapi import HTTPException from sqlalchemy import create_engine from sqlalchemy.orm import Session, declarative_base, sessionmaker -Database_url = "sqlite:///./Database.db" +if TYPE_CHECKING: + from app.data.database_objects import DBTask + +Database_url = os.getenv("DATABASE_URL", "sqlite:///./Database.db") Engine = create_engine(Database_url, connect_args={"check_same_thread": False}) LocalSession = sessionmaker(bind=Engine, autocommit=False, autoflush=False) Base = declarative_base() @@ -25,19 +33,19 @@ class DataBaseMethods: # Adds a data object to database @staticmethod - def add_object(db: Session, new_object): + def add_object(db: Session, new_object: DBTask) -> DBTask: """ Adds a database object to the database. Args: db (Session): Database session, can be grabbed with get_db() - new_object (database_objects): New + new_object (DBTask): New database object to be added must be inside the database_objects.py module Returns: - database_object: returns the entered object + DBTask: returns the entered object if it was successfully added """ try: @@ -55,13 +63,13 @@ def add_object(db: Session, new_object): # deletes a data object from database @staticmethod - def delete_object(db: Session, object_to_delete): + def delete_object(db: Session, object_to_delete: DBTask) -> bool: """ Deletes a database object from the database. Args: db (Session): Database session, can be grabbed with get_db() - object_to_delete (database_objects): New database object to be added + object_to_delete (DBTask): New database object to be added must be inside the database_objects.py module Returns: @@ -82,18 +90,18 @@ def delete_object(db: Session, object_to_delete): # Gets an object by Name from the database @staticmethod - def get_object_by_name(db: Session, obj_ref, name: str): + def get_object_by_name(db: Session, obj_ref, name: str) -> DBTask | None: """ Gets an object based on the name entered. Args: db (Session): Database session, can be grabbed with get_db() name (string): Name of the object - obj_ref (database_objects): Object reference, so an object from + obj_ref (DBTask): Object reference, so an object from the database_objects.py module Returns: - database_object: returns the object if it was successfully found + DBTask: returns the object if it was successfully found, otherwise None """ if not obj_ref.name: raise HTTPException(status_code=500, detail="Object must have a name") @@ -108,18 +116,18 @@ def get_object_by_name(db: Session, obj_ref, name: str): # Gets an object by ID from the database, data object must have ID field @staticmethod - def get_object_by_id(db: Session, obj_ref, object_id: int): + def get_object_by_id(db: Session, obj_ref, object_id: int) -> DBTask | None: """ Gets an object based on the id entered. Args: db (Session): Database session, can be grabbed with get_db() object_id (int): ID of the object - obj_ref (database_objects): Object reference, so an object from + obj_ref (DBTask): Object reference, so an object from the database_objects.py module Returns: - database_object: returns the object if it was successfully found + DBTask: returns the object if it was successfully found """ try: param = obj_ref.id @@ -130,7 +138,7 @@ def get_object_by_id(db: Session, obj_ref, object_id: int): ) @staticmethod - def query_db(db: Session, obj_ref, field: str, value): + def query_db(db: Session, obj_ref, field: str, value) -> list[DBTask]: if value is None: try: return db.query(obj_ref).filter(obj_ref.id).all() @@ -139,6 +147,7 @@ def query_db(db: Session, obj_ref, field: str, value): status_code=404, detail=f"Object with filed: {field}, does not exist", ) + return [] else: try: param = getattr(obj_ref, field) @@ -148,6 +157,7 @@ def query_db(db: Session, obj_ref, field: str, value): status_code=404, detail=f"Object with filed: {field}, does not exist", ) + return [] def get_session() -> Session: