chore(api): separate api and package pyproject (#1098)

* chore(api): separate api and package pyproject

* fix: setupdb scripts

* fix: add back authlib to the package

Author: inimaz

.github/workflows/build-server.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Python
       run: uv python install 3.12
     - name: Install dependencies
-      run: uv sync --extra api
+      run: uv sync --project carbonserver
     - name: Unit tests on api
       run: uv run task test-api-unit
   test_api_server:
@@ -60,7 +60,7 @@ jobs:
     - name: Set up Python
       run: uv python install 3.12
     - name: Install dependencies
-      run: uv sync --extra api
+      run: uv sync --project carbonserver
     - name: Setup database
       env:
         DATABASE_URL: postgresql://codecarbon-user:supersecret@localhost:5480/codecarbon_db

carbonserver/pyproject.toml

@@ -16,6 +16,7 @@ classifiers = [
 ]
 dependencies = [
     "alembic<2.0.0",
+    "authlib>=1.2.1",
     "bcrypt<5.0.0",
     "python-dateutil<3.0.0",
     "dependency-injector<5.0.0",
@@ -46,7 +47,7 @@ dependencies = [
 Homepage = "https://codecarbon.io/"
 Repository = "https://github.com/mlco2/codecarbon"
 Dashboard = "http://dashboard.codecarbon.io/"
-Documentation = "https://mlco2.github.io/codecarbon/"
+Documentation = "https://docs.codecarbon.io/"
 Issues = "https://github.com/mlco2/codecarbon/issues"
 Changelog = "https://github.com/mlco2/codecarbon/releases"
 

carbonserver/uv.lock

@@ -71,39 +71,12 @@ codecarbon = [
 Homepage = "https://codecarbon.io/"
 Repository = "https://github.com/mlco2/codecarbon"
 Dashboard = "http://dashboard.codecarbon.io/"
-Documentation = "https://mlco2.github.io/codecarbon/"
+Documentation = "https://docs.codecarbon.io/"
 Issues = "https://github.com/mlco2/codecarbon/issues"
 Changelog = "https://github.com/mlco2/codecarbon/releases"
 
 
 [dependency-groups]
-api  = [
-    "alembic<2.0.0",
-    "authlib>=1.2.1",
-    "bcrypt<5.0.0",
-    "python-dateutil<3.0.0",
-    "dependency-injector<5.0.0",
-    "fastapi<1.0.0",
-    "fief-client[fastapi]",
-    "httpx",
-    "pydantic[email]<2.0.0",
-    "psycopg2-binary<3.0.0",
-    "requests<3.0.0",
-    "sqlalchemy<2.0.0",
-    "uvicorn[standard]<1.0.0",
-    "fastapi-pagination<1.0.0",
-    "pytest",
-    "mock",
-    "responses",
-    "fastapi-oidc;python_version>='3.10'",
-    "numpy",
-    "psutil",
-    "requests-mock",
-    "rapidfuzz",
-    "PyJWT",
-    "logfire[fastapi]>=1.0.1",
-    "itsdangerous",
-]
 dev = [
     "taskipy",
     "bumpver",
@@ -138,47 +111,21 @@ viz-legacy = [
     "fire",
 ]
 
-api  = [
-    "alembic<2.0.0",
-    "authlib>=1.2.1",
-    "bcrypt<5.0.0",
-    "python-dateutil<3.0.0",
-    "dependency-injector<5.0.0",
-    "fastapi<1.0.0",
-    "fief-client[fastapi]",
-    "httpx",
-    "itsdangerous",
-    "pydantic[email]<2.0.0",
-    "psycopg2-binary<3.0.0",
-    "requests<3.0.0",
-    "sqlalchemy<2.0.0",
-    "uvicorn[standard]<1.0.0",
-    "fastapi-pagination<1.0.0",
-    "pytest",
-    "mock",
-    "responses",
-    "fastapi-oidc;python_version>='3.10'",
-    "numpy",
-    "psutil",
-    "requests-mock",
-    "rapidfuzz",
-    "PyJWT",
-]
-
 
 [project.scripts]
 carbonboard = "codecarbon.viz.carbonboard:main"
 codecarbon = "codecarbon.cli.main:main"
 
 [tool.taskipy.tasks]
 pre-commit-install = { cmd = "pre-commit install", help = "Install pre-commit hook." }
-dashboard = "cd carbonserver && uvicorn main:app --reload"
-dashboard-ci = "cd carbonserver && uvicorn main:app --host 0.0.0.0 --port 8008"
+dashboard = "uv run --project carbonserver uvicorn main:app --reload"
+dashboard-ci = "uv run --project carbonserver uvicorn main:app --host 0.0.0.0 --port 8008"
 docker = "docker-compose up -d"
-test-api-unit = "cd carbonserver && python -m pytest -vv tests/api/routers && python -m pytest -vv tests/api/service/ && python -m pytest -vv tests/api/usecase/"
-test-api-integ = "cd carbonserver && python -m pytest -vv tests/api/integration/"
-setup-db = "cd carbonserver && python3 -m alembic -c carbonserver/database/alembic.ini upgrade head"
-downgrade-db = "cd carbonserver && python -m alembic -c carbonserver/database/alembic.ini downgrade base"
+test-api-unit = "uv run --project carbonserver python -m pytest -vv carbonserver/tests/api/routers && uv run --project carbonserver python -m pytest -vv carbonserver/tests/api/service/ && uv run --project carbonserver python -m pytest -vv carbonserver/tests/api/usecase/"
+test-api-integ = "uv run --project carbonserver python -m pytest -vv carbonserver/tests/api/integration/"
+setup-db = "cd carbonserver && uv run --project carbonserver python -m alembic -c carbonserver/database/alembic.ini upgrade head"
+downgrade-db = "cd carbonserver && uv run --project carbonserver python -m alembic -c carbonserver/database/alembic.ini downgrade base"
+carbonserver-api-requirements = "uv pip compile carbonserver/pyproject.toml --output-file requirements/requirements-api.txt"
 build-doc = "zensical build -f mkdocs.yml"
 precommit-install = "pre-commit install"
 precommit-update = "pre-commit autoupdate"

pyproject.toml

@@ -8,10 +8,10 @@ This file contains all dependencies needed to run the CodeCarbon API server (car
 
 ### Updating the file
 
-When you modify dependencies in `pyproject.toml` (especially those under the `[project.optional-dependencies.api]` section), you **must** regenerate this file:
+When you modify dependencies in `carbonserver/pyproject.toml`, you **must** regenerate this file:
 
 ```bash
-uv pip compile pyproject.toml --extra api --output-file requirements/requirements-api.txt
+uv pip compile carbonserver/pyproject.toml --output-file requirements/requirements-api.txt
 ```
 
 Then commit the updated file.