Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions carbonserver/carbonserver/api/services/signup_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from uuid import UUID

import jwt
import logfire
from fastapi import HTTPException

from carbonserver.api.infra.repositories.repository_organizations import (
Expand Down Expand Up @@ -39,11 +38,9 @@ def sign_up(
self,
user: UserAutoCreate,
) -> User:
with logfire.span("User applicative creation", service="signup"):
created_user = self._user_repository.create_user(user)
subscribed_user = self.new_user_setup(created_user)
logfire.info(str(subscribed_user))
LOGGER.info(f"User {subscribed_user.id} created")
created_user = self._user_repository.create_user(user)
subscribed_user = self.new_user_setup(created_user)
LOGGER.info(f"User {subscribed_user.id} created")
return subscribed_user

def subscribe_user_to_org(
Expand Down
2 changes: 0 additions & 2 deletions carbonserver/carbonserver/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ def fief_url(self) -> str:
frontend_url: str = Field("", env="FRONTEND_URL")
environment: str = Field("production")
jwt_key: str = Field("", env="JWT_KEY")
logfire_token: str = Field("", env="LOGFIRE_TOKEN")
send_to_logfire: bool = Field(False, env="LOGFIRE_SEND_TO_LOGFIRE")
api_port: int = Field(8080, env="API_PORT")
server_host: str = Field("0.0.0.0", env="SERVER_HOST")

Expand Down
5 changes: 0 additions & 5 deletions carbonserver/main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os

import logfire
from fastapi import FastAPI
from fastapi_pagination import add_pagination
from pydantic import ValidationError
Expand Down Expand Up @@ -83,17 +82,13 @@ def init_db(container):


def init_server(container):
logfire.configure(
token=settings.logfire_token, send_to_logfire=settings.send_to_logfire
)
server = FastAPI(
servers=[
{"url": "/api/"},
],
port=settings.api_port,
host=settings.server_host,
)
logfire.instrument_fastapi(server)

server.container = container
server.include_router(users.router)
Expand Down
2 changes: 0 additions & 2 deletions carbonserver/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ dependencies = [
"fastapi<1.0.0",
"fief-client[fastapi]",
"fastapi[standard]",
"logfire",
"httpx",
"pydantic[email]<2.0.0",
"psycopg2-binary<3.0.0",
Expand All @@ -38,7 +37,6 @@ dependencies = [
"requests-mock",
"rapidfuzz",
"PyJWT",
"logfire[fastapi]>=1.0.1",
"fastapi-oidc>=0.0.9",
]

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ dev = [
"requests",
"requests-mock",
"responses",
"logfire>=1.0.1",
"pytest-cov",
"logfire>=1.0.1", # For testing Logfire output method
]
doc = [
"sphinx",
Expand Down Expand Up @@ -133,7 +133,6 @@ api = [
"requests-mock",
"rapidfuzz",
"PyJWT",
"logfire[fastapi]>=1.0.1",
]

[project.scripts]
Expand Down
71 changes: 3 additions & 68 deletions requirements/requirements-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ anyio==4.12.0
# watchfiles
arrow==1.4.0
# via codecarbon (pyproject.toml)
asgiref==3.11.0
# via opentelemetry-instrumentation-asgi
bcrypt==4.3.0
# via codecarbon (pyproject.toml)
cachetools==6.2.3
Expand Down Expand Up @@ -43,8 +41,6 @@ ecdsa==0.19.1
# via python-jose
email-validator==2.3.0
# via pydantic
executing==2.2.1
# via logfire
fastapi==0.123.0
# via
# codecarbon (pyproject.toml)
Expand All @@ -57,8 +53,8 @@ fastapi-pagination==0.15.0
# via codecarbon (pyproject.toml)
fief-client==0.20.0
# via codecarbon (pyproject.toml)
googleapis-common-protos==1.72.0
# via opentelemetry-exporter-otlp-proto-http
greenlet==3.3.1
# via sqlalchemy
h11==0.16.0
# via
# httpcore
Expand All @@ -77,14 +73,10 @@ idna==3.11
# email-validator
# httpx
# requests
importlib-metadata==8.7.0
# via opentelemetry-api
iniconfig==2.3.0
# via pytest
jwcrypto==1.5.6
# via fief-client
logfire==4.15.1
# via codecarbon (pyproject.toml)
makefun==1.16.0
# via fief-client
mako==1.3.10
Expand All @@ -103,49 +95,8 @@ numpy==2.4.2
# pandas
nvidia-ml-py==13.580.82
# via codecarbon (pyproject.toml)
opentelemetry-api==1.38.0
# via
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-instrumentation
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
# opentelemetry-sdk
# opentelemetry-semantic-conventions
opentelemetry-exporter-otlp-proto-common==1.38.0
# via opentelemetry-exporter-otlp-proto-http
opentelemetry-exporter-otlp-proto-http==1.38.0
# via logfire
opentelemetry-instrumentation==0.59b0
# via
# logfire
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
opentelemetry-instrumentation-asgi==0.59b0
# via opentelemetry-instrumentation-fastapi
opentelemetry-instrumentation-fastapi==0.59b0
# via logfire
opentelemetry-proto==1.38.0
# via
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-http
opentelemetry-sdk==1.38.0
# via
# logfire
# opentelemetry-exporter-otlp-proto-http
opentelemetry-semantic-conventions==0.59b0
# via
# opentelemetry-instrumentation
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
# opentelemetry-sdk
opentelemetry-util-http==0.59b0
# via
# opentelemetry-instrumentation-asgi
# opentelemetry-instrumentation-fastapi
packaging==25.0
# via
# opentelemetry-instrumentation
# pytest
# via pytest
pandas==2.3.3
# via codecarbon (pyproject.toml)
pluggy==1.6.0
Expand All @@ -154,11 +105,6 @@ prometheus-client==0.23.1
# via codecarbon (pyproject.toml)
prompt-toolkit==3.0.52
# via questionary
protobuf==6.33.5
# via
# googleapis-common-protos
# logfire
# opentelemetry-proto
psutil==6.1.1
# via codecarbon (pyproject.toml)
psycopg2-binary==2.9.11
Expand Down Expand Up @@ -208,7 +154,6 @@ requests==2.32.5
# via
# codecarbon (pyproject.toml)
# fastapi-oidc
# opentelemetry-exporter-otlp-proto-http
# requests-mock
# responses
requests-mock==1.12.1
Expand All @@ -218,7 +163,6 @@ responses==0.25.8
rich==14.2.0
# via
# codecarbon (pyproject.toml)
# logfire
# typer
rsa==4.9.1
# via python-jose
Expand Down Expand Up @@ -247,11 +191,6 @@ typing-extensions==4.15.0
# fastapi
# fastapi-pagination
# jwcrypto
# logfire
# opentelemetry-api
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-sdk
# opentelemetry-semantic-conventions
# pydantic
# starlette
# typer
Expand All @@ -273,9 +212,5 @@ wcwidth==0.2.14
# via prompt-toolkit
websockets==15.0.1
# via uvicorn
wrapt==1.17.3
# via opentelemetry-instrumentation
yaspin==3.3.0
# via fief-client
zipp==3.23.0
# via importlib-metadata
Loading