chore: remove unused dependency group & recompile dependencies

Author: SaboniAmine

carbonserver/carbonserver/api/schemas.py

@@ -18,7 +18,6 @@
 
 class Empty(BaseModel):
     model_config = ConfigDict(extra="forbid")
-    pass
 
 
 class UserBase(BaseModel):

carbonserver/carbonserver/config.py

@@ -30,41 +30,36 @@ class Settings(BaseSettings):
     )
     oidc_issuer_url: str = Field(
         "https://auth.codecarbon.io/codecarbon-dev",
-        validation_alias=AliasChoices(
-            "OIDC_ISSUER_URL", "FIEF_URL", "oidc_issuer_url"
-        ),
+        validation_alias=AliasChoices("OIDC_ISSUER_URL", "FIEF_URL", "oidc_issuer_url"),
+    )
+    oidc_well_known_url: str = Field(
+        "",
+        validation_alias=AliasChoices("OIDC_WELL_KNOWN_URL", "oidc_well_known_url"),
     )
-    oidc_well_known_url: str = ""
     frontend_url: str = Field(
         "",
         validation_alias=AliasChoices("FRONTEND_URL", "frontend_url"),
     )
     environment: str = Field("production")
-    jwt_key: str = Field("", env="JWT_KEY")
-    api_port: int = Field(8080, env="API_PORT")
-    server_host: str = Field("0.0.0.0", env="SERVER_HOST")
+    jwt_key: str = Field("", validation_alias=AliasChoices("JWT_KEY", "jwt_key"))
+    api_port: int = Field(8080, validation_alias=AliasChoices("API_PORT", "api_port"))
+    server_host: str = Field(
+        "0.0.0.0", validation_alias=AliasChoices("SERVER_HOST", "server_host")
+    )
 
     # Fief settings (deprecated)
-    fief_client_id: str = ""
-    fief_client_secret: str = ""
-    fief_url: str = ""
-
-    class Config:
-        # Define alternative environment variable names for backward compatibility
-        fields = {
-            "oidc_client_id": {"env": ["OIDC_CLIENT_ID"]},
-            "oidc_client_secret": {"env": ["OIDC_CLIENT_SECRET"]},
-            "oidc_issuer_url": {"env": ["OIDC_ISSUER_URL"]},
-            "fief_client_id": {"env": ["FIEF_CLIENT_ID"]},
-            "fief_client_secret": {"env": ["FIEF_CLIENT_SECRET"]},
-            "fief_url": {"env": ["FIEF_URL"]},
-            "oidc_well_known_url": {
-                "env": [
-                    "OIDC_WELL_KNOWN_URL",
-                    "FIEF_URL" + "/.well-known/openid-configuration",
-                ]
-            },
-        }
+    fief_client_id: str = Field(
+        "",
+        validation_alias=AliasChoices("FIEF_CLIENT_ID", "fief_client_id"),
+    )
+    fief_client_secret: str = Field(
+        "",
+        validation_alias=AliasChoices("FIEF_CLIENT_SECRET", "fief_client_secret"),
+    )
+    fief_url: str = Field(
+        "",
+        validation_alias=AliasChoices("FIEF_URL", "fief_url"),
+    )
 
 
 settings = Settings()

carbonserver/tests/api/routers/test_organizations.py

@@ -169,6 +169,7 @@ def test_fetch_org_users(client, custom_test_server):
             "name": "user1",
             "organizations": None,
             "is_active": True,
+            "organization_id": ORG_1["id"],
             "is_admin": True,
         }
     ]

carbonserver/tests/api/routers/test_project_tokens.py

@@ -64,7 +64,7 @@ def test_add_project_token(client, custom_test_server):
         repository_mock
     ):
         response = client.post(
-            "/projects/{PROJECT_ID}/api-tokens", json=PROJECT_TOKEN_TO_CREATE
+            f"/projects/{PROJECT_ID}/api-tokens", json=PROJECT_TOKEN_TO_CREATE
         )
         actual_project_token = response.json()
 

pyproject.toml

@@ -77,34 +77,7 @@ 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,<3.0.0",
-    "pydantic-settings>=2.0.0,<3.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",
@@ -148,8 +121,8 @@ api  = [
     "fastapi<1.0.0",
     "fief-client[fastapi]",
     "httpx",
-    "itsdangerous",
-    "pydantic[email]<2.0.0",
+    "pydantic[email]>=2.0.0,<3.0.0",
+    "pydantic-settings>=2.0.0,<3.0.0",
     "psycopg2-binary<3.0.0",
     "requests<3.0.0",
     "sqlalchemy<2.0.0",
@@ -164,9 +137,9 @@ api  = [
     "requests-mock",
     "rapidfuzz",
     "PyJWT",
+    "itsdangerous",
 ]
 
-
 [project.scripts]
 carbonboard = "codecarbon.viz.carbonboard:main"
 codecarbon = "codecarbon.cli.main:main"

requirements/requirements-api.txt

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile pyproject.toml --extra api --output-file requirements/requirements-api.txt --python 3.12
+#    uv pip compile pyproject.toml --extra api --output-file requirements/requirements-api.txt
 alembic==1.18.4
     # via codecarbon (pyproject.toml)
 annotated-doc==0.0.4
@@ -192,8 +192,6 @@ sqlalchemy==1.4.54
     #   alembic
 starlette==0.50.0
     # via fastapi
-termcolor==3.3.0
-    # via yaspin
 typer==0.23.1
     # via codecarbon (pyproject.toml)
 typing-extensions==4.15.0
@@ -229,5 +227,3 @@ wcwidth==0.6.0
     # via prompt-toolkit
 websockets==16.0
     # via uvicorn
-yaspin==3.4.0
-    # via fief-client