Skip to content

Commit ee527fd

Browse files
authored
Fix clever deployment (#916)
* chore: change package management to uv for backend * lint / fix tests
1 parent bfb2fdb commit ee527fd

22 files changed

Lines changed: 338 additions & 18 deletions

.github/workflows/deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- "webapp/**"
88
- "pyproject.toml"
99
branches: [master]
10+
workflow_dispatch:
1011

1112
permissions:
1213
contents: read
@@ -38,8 +39,9 @@ jobs:
3839
CLEVER_APP_ID: ${{ secrets.BE_CLEVER_APP_ID_PROD }}
3940
APP_NAME: cc_api_prod
4041
run: |
42+
uv pip compile carbonserver/pyproject.toml > requirements/requirements-api.txt
4143
./clever-tools-latest_linux/clever link $CLEVER_APP_ID
42-
./clever-tools-latest_linux/clever deploy -f --app $CLEVER_APP_ID
44+
./clever-tools-latest_linux/clever deploy -f
4345
4446
- name: Deploy frontend to Clever Cloud (PROD)
4547
env:

carbonserver/carbonserver/api/routers/authenticate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from typing import Optional
55

66
import requests
7-
from container import ServerContainer
87
from dependency_injector.wiring import Provide, inject
98
from fastapi import APIRouter, Depends, Query, Request, Response
109
from fastapi.responses import RedirectResponse
@@ -16,6 +15,7 @@
1615
)
1716
from carbonserver.api.services.signup_service import SignUpService
1817
from carbonserver.config import settings
18+
from carbonserver.container import ServerContainer
1919

2020
AUTHENTICATE_ROUTER_TAGS = ["Authenticate"]
2121
LOGGER = logging.getLogger(__name__)

carbonserver/carbonserver/api/routers/emissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from typing import Generic, TypeVar
22
from uuid import UUID
33

4-
from container import ServerContainer
54
from dependency_injector.wiring import Provide, inject
65
from fastapi import APIRouter, Depends, Header, Query
76
from fastapi_pagination import Page, paginate
@@ -12,6 +11,7 @@
1211
from carbonserver.api.schemas import AccessLevel, Emission, EmissionCreate
1312
from carbonserver.api.services.emissions_service import EmissionService
1413
from carbonserver.api.services.project_token_service import ProjectTokenService
14+
from carbonserver.container import ServerContainer
1515

1616
# T, Params and Page are needed to override default pagination of get_emissions_from_run
1717
T = TypeVar("T")

carbonserver/carbonserver/api/routers/experiments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from typing import List, Optional
33

44
import dateutil.relativedelta
5-
from container import ServerContainer
65
from dependency_injector.wiring import Provide, inject
76
from fastapi import APIRouter, Depends
87
from starlette import status
@@ -17,6 +16,7 @@
1716
from carbonserver.api.usecases.experiment.project_sum_by_experiment import (
1817
ProjectSumsByExperimentUsecase,
1918
)
19+
from carbonserver.container import ServerContainer
2020

2121
EXPERIMENTS_ROUTER_TAGS = ["Experiments"]
2222

carbonserver/carbonserver/api/routers/organizations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from typing import List, Optional
33

44
import dateutil.relativedelta
5-
from container import ServerContainer
65
from dependency_injector.wiring import Provide, inject
76
from fastapi import APIRouter, Depends
87
from pydantic import BaseModel, EmailStr
@@ -23,6 +22,7 @@
2322
from carbonserver.api.usecases.organization.organization_sum import (
2423
OrganizationSumsUsecase,
2524
)
25+
from carbonserver.container import ServerContainer
2626

2727
ORGANIZATIONS_ROUTER_TAGS = ["Organizations"]
2828

carbonserver/carbonserver/api/routers/project_api_tokens.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from typing import List
22

3-
from container import ServerContainer
43
from dependency_injector.wiring import Provide, inject
54
from fastapi import APIRouter, Depends
65
from starlette import status
@@ -11,6 +10,7 @@
1110
UserWithAuthDependency,
1211
)
1312
from carbonserver.api.services.project_token_service import ProjectTokenService
13+
from carbonserver.container import ServerContainer
1414

1515
PROJECTS_TOKENS_ROUTER_TAGS = ["Project tokens"]
1616

carbonserver/carbonserver/api/routers/projects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from typing import List, Optional
33

44
import dateutil.relativedelta
5-
from container import ServerContainer
65
from dependency_injector.wiring import Provide, inject
76
from fastapi import APIRouter, Depends
87
from starlette import status
@@ -15,6 +14,7 @@
1514
)
1615
from carbonserver.api.services.project_service import ProjectService
1716
from carbonserver.api.usecases.project.project_sum import ProjectSumsUsecase
17+
from carbonserver.container import ServerContainer
1818

1919
PROJECTS_ROUTER_TAGS = ["Projects"]
2020

carbonserver/carbonserver/api/routers/runs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from typing import List, Optional, Union
33

44
import dateutil.relativedelta
5-
from container import ServerContainer
65
from dependency_injector.wiring import Provide, inject
76
from fastapi import APIRouter, Depends, Header
87
from starlette import status
@@ -14,6 +13,7 @@
1413
from carbonserver.api.usecases.run.experiment_sum_by_run import (
1514
ExperimentSumsByRunUsecase,
1615
)
16+
from carbonserver.container import ServerContainer
1717
from carbonserver.logger import logger
1818

1919
RUNS_ROUTER_TAGS = ["Runs"]

carbonserver/carbonserver/api/routers/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from container import ServerContainer
21
from dependency_injector.wiring import Provide, inject
32
from fastapi import APIRouter, Depends, status
43

54
from carbonserver.api.schemas import User
65
from carbonserver.api.services.user_service import UserService
6+
from carbonserver.container import ServerContainer
77

88
USERS_ROUTER_TAGS = ["Users"]
99

carbonserver/carbonserver/api/services/auth_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from typing import Optional
33

44
import jwt
5-
from container import ServerContainer
65
from dependency_injector.wiring import Provide
76
from fastapi import Depends, HTTPException
87
from fastapi.security import APIKeyCookie, HTTPBearer, OAuth2AuthorizationCodeBearer
@@ -14,6 +13,7 @@
1413

1514
from carbonserver.api.services.user_service import UserService
1615
from carbonserver.config import settings
16+
from carbonserver.container import ServerContainer
1717

1818
OAUTH_SCOPES = ["openid", "email", "profile"]
1919
fief = FiefAsync(

0 commit comments

Comments
 (0)