Revert "feat(Option): Logfire (#88)"

This reverts commit 8600e12.

Author: mslaursen

docker-compose.yaml

@@ -1,19 +1,19 @@
 services:
   postgres:
     image: postgres:17.4-bookworm
-    hostname: postgres
-    container_name: postgres
+    hostname: forge
+    container_name: forge
     environment:
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_USER: postgres
-      POSTGRES_DB: postgres
+      POSTGRES_PASSWORD: forge
+      POSTGRES_USER: forge
+      POSTGRES_DB: forge
     volumes:
       - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     ports:
       - "5432:5432"
     restart: always
     healthcheck:
-      test: pg_isready -U postgres
+      test: pg_isready -U forge
       interval: 2s
       timeout: 3s
       retries: 40

fastapi_forge/example-projects/game_zone.yaml

@@ -7,7 +7,6 @@ project:
   use_rabbitmq: true
   use_taskiq: true
   use_prometheus: true
-  use_logfire: true
 
   custom_enums:
     - name: UserRole

fastapi_forge/frontend/panels/project_config_panel.py

@@ -206,18 +206,13 @@ def _build(self) -> None:
                 )
 
             with ui.column().classes("w-full gap-2"):
-                ui.label("Observability").classes("text-lg font-bold")
+                ui.label("Metrics").classes("text-lg font-bold")
                 self.use_prometheus = (
                     ui.checkbox("Prometheus", value=state.use_prometheus)
                     .classes("w-full")
                     .bind_value_from(state, "use_prometheus")
                     .tooltip("Collect and query metrics with Prometheus")
                 )
-                self.use_logfire = (
-                    ui.checkbox("Logfire", value=state.use_logfire)
-                    .classes("w-full")
-                    .bind_value_from(state, "use_logfire")
-                )
 
             with ui.column().classes("w-full gap-2"):
                 ui.label("Object Storage").classes("text-lg font-bold")
@@ -252,7 +247,6 @@ def _bind_state_to_ui(self) -> None:
         )
         self.use_taskiq.bind_value_to(state, "use_taskiq")
         self.use_prometheus.bind_value_to(state, "use_prometheus")
-        self.use_logfire.bind_value_to(state, "use_logfire")
 
     def _update_taskiq_state(self, *_) -> None:
         """Enable or disable Taskiq based on Redis and RabbitMQ."""
@@ -428,7 +422,6 @@ async def _create_project(self) -> None:
             state.use_rabbitmq = self.use_rabbitmq.value
             state.use_taskiq = self.use_taskiq.value
             state.use_prometheus = self.use_prometheus.value
-            state.use_logfire = self.use_logfire.value
 
             project_spec = state.get_project_spec()
             await build_fastapi_project(project_spec)

fastapi_forge/frontend/state.py

@@ -55,7 +55,6 @@ class ProjectState(BaseModel):
     use_rabbitmq: bool = False
     use_taskiq: bool = False
     use_prometheus: bool = False
-    use_logfire: bool = False
 
     def get_render_manager(self) -> RenderManager:
         """Get the render manager for the current project."""
@@ -89,7 +88,6 @@ def initialize_from_project(self, project: ProjectSpec) -> None:
         self.use_rabbitmq = project.use_rabbitmq
         self.use_taskiq = project.use_taskiq
         self.use_prometheus = project.use_prometheus
-        self.use_logfire = project.use_logfire
         self.models = project.models.copy()
         self.custom_enums = project.custom_enums.copy()
 
@@ -205,7 +203,6 @@ def get_project_spec(self) -> ProjectSpec:
             use_rabbitmq=self.use_rabbitmq,
             use_taskiq=self.use_taskiq,
             use_prometheus=self.use_prometheus,
-            use_logfire=self.use_logfire,
             models=self.models,
             custom_enums=self.custom_enums,
         )

fastapi_forge/schemas.py

@@ -414,7 +414,6 @@ class ProjectSpec(_Base):
     use_rabbitmq: bool = False
     use_taskiq: bool = False
     use_prometheus: bool = False
-    use_logfire: bool = False
     models: list[Model] = []
     custom_enums: list[CustomEnum] = []
 

fastapi_forge/template/cookiecutter.json

@@ -23,9 +23,6 @@
     "use_prometheus": {
         "default": true
     },
-    "use_logfire": {
-        "default": true
-    },
     "models": {
         "models": []
     },

fastapi_forge/template/{{cookiecutter.project_name}}/.env.example

@@ -32,8 +32,4 @@
 {% endif %}
 {%- if cookiecutter.use_prometheus %}
 {{ cookiecutter.project_name|upper|replace('-', '_') }}_PROMETHEUS_ENABLED=True
-{% endif %}
-{%- if cookiecutter.use_logfire %}
-{{ cookiecutter.project_name|upper|replace('-', '_') }}_LOGFIRE_ENABLED=True
-{{ cookiecutter.project_name|upper|replace('-', '_') }}_LOGFIRE_WRITE_TOKEN=""
 {% endif %}

fastapi_forge/template/{{cookiecutter.project_name}}/forge-config.yaml

@@ -39,11 +39,6 @@ paths:
     paths:
       - observability/prometheus
 
-  use_logfire:
-    enabled: {{cookiecutter.use_logfire | lower}}
-    paths:
-      - observability/logfire
-
   constants:
     requires_all:
       - use_builtin_auth
@@ -54,7 +49,6 @@ paths:
   observability:
     requires_all:
       - use_prometheus
-      - use_logfire
     paths:
       - observability
 

fastapi_forge/template/{{cookiecutter.project_name}}/pyproject.toml

@@ -47,9 +47,6 @@ dependencies = [
     {%- if cookiecutter.use_prometheus -%}
     "prometheus-fastapi-instrumentator>=7.1.0",
     {%- endif %}
-    {%- if cookiecutter.use_logfire -%}
-    "logfire[aio-pika,asyncpg,fastapi,httpx,sqlalchemy,system-metrics]>=3.16.0",
-    {%- endif %}
 ]
 
 [tool.pytest.ini_options]

fastapi_forge/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/middleware.py

@@ -4,10 +4,6 @@
 {% if cookiecutter.use_prometheus %}
 from prometheus_fastapi_instrumentator import Instrumentator
 {% endif %}
-{% if cookiecutter.use_logfire %}
-import logfire
-from loguru import logger
-{% endif %}
 
 def _add_cors_middleware(app: FastAPI) -> None:
     """Add CORS Middleware."""
@@ -19,27 +15,9 @@ def _add_prometheus_middleware(app: FastAPI) -> None:
         instrumenter = Instrumentator().instrument(app)
         instrumenter.expose(app)
 {% endif %}
-{% if cookiecutter.use_logfire %}
-def _add_logfire_middleware(app: FastAPI) -> None:
-    """Add Logfire Middleware."""
-    if settings.logfire.enabled:
-        logfire.configure(
-            token=settings.logfire.write_token.get_secret_value(),
-            environment=settings.env,
-            send_to_logfire="if-token-present",
-            service_name="{{ cookiecutter.project_name }}"
-        )
-        logfire.instrument_fastapi(app, capture_headers=True)
-        logfire.instrument_asyncpg()
-        logfire.instrument_system_metrics()
-        logger.configure(handlers=[logfire.loguru_handler()])
-{% endif %}
 def add_middleware(app: FastAPI) -> None:
     """Add all middlewares."""
     _add_cors_middleware(app)
     {%- if cookiecutter.use_prometheus %}
     _add_prometheus_middleware(app)
-    {%- endif %}
-    {%- if cookiecutter.use_logfire %}
-    _add_logfire_middleware(app)
     {% endif %}