Adding sentry to the code (#87)

* Adding poetry to the code * Client SQL removed * Few changes to the codebase * version change * poetry update * poetry update * updates to app.py * Error change * minor update * isort update * pyproject update * poetry update * client sql change * version change * remvoving clientsql * minor change * minor change? * cleanup * minor change * update to test app * updated format
openclimatefix · Sep 27, 2024 · 0524981 · 0524981
1 parent 18e8193
commit 0524981
Show file tree

Hide file tree

Showing 8 changed files with 2,486 additions and 2,241 deletions.
diff --git a/database-cleanup/database_cleanup/app.py b/database-cleanup/database_cleanup/app.py
@@ -12,12 +12,23 @@
 import uuid
 
 import click
+import importlib.metadata
+import sentry_sdk
 import sqlalchemy as sa
 from pvsite_datamodel.sqlmodels import ForecastSQL, ForecastValueSQL
 from sqlalchemy.orm import Session, sessionmaker
 
 _log = logging.getLogger(__name__)
 
+version = importlib.metadata.version("database-cleanup")
+
+sentry_sdk.init(
+    dsn=os.getenv("SENTRY_DSN"), environment=os.getenv("ENVIRONMENT", "local"), traces_sample_rate=1
+)
+
+sentry_sdk.set_tag("app_name", "pv-site-production_database_cleanup")
+sentry_sdk.set_tag("version", version)
+
 
 @contextlib.contextmanager
 def _profile(msg: str):

diff --git a/database-cleanup/poetry.lock b/database-cleanup/poetry.lock
diff --git a/database-cleanup/pyproject.toml b/database-cleanup/pyproject.toml
@@ -9,7 +9,8 @@ packages = [{include = "database_cleanup"}]
 python = "^3.10"
 pvsite-datamodel = "^0.1.32"
 click = "^8.1.3"
-
+sentry-sdk = "^2.1.1"
+setuptools = "^75.1.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.1.0"

diff --git a/database-cleanup/tests/conftest.py b/database-cleanup/tests/conftest.py
@@ -2,7 +2,7 @@
 
 import pytest
 import sqlalchemy as sa
-from pvsite_datamodel.sqlmodels import Base, ClientSQL, SiteSQL
+from pvsite_datamodel.sqlmodels import Base, SiteSQL
 from sqlalchemy.orm import Session
 from testcontainers.postgres import PostgresContainer
 
@@ -29,11 +29,9 @@ def fill_db(engine):
     num_sites = 3
     with Session(engine) as session:
         for i in range(num_clients):
-            client = ClientSQL(client_name=f"client-{i}")
-            session.add(client)
             session.commit()
             for j in range(num_sites):
-                session.add(SiteSQL(client_uuid=client.client_uuid, ml_id=j + num_sites * i))
+                session.add(SiteSQL(ml_id=j + num_sites * i))
                 session.commit()
 
 

diff --git a/database-cleanup/tests/test_app.py b/database-cleanup/tests/test_app.py
@@ -6,7 +6,7 @@
 from click.testing import CliRunner
 from database_cleanup.app import main
 from freezegun import freeze_time
-from pvsite_datamodel.sqlmodels import ClientSQL, ForecastSQL, ForecastValueSQL, SiteSQL
+from pvsite_datamodel.sqlmodels import ForecastSQL, ForecastValueSQL, SiteSQL
 from sqlalchemy.orm import Session
 
 
@@ -54,11 +54,7 @@ def _run_cli(func, args: list[str]):
 @pytest.fixture
 def site(session):
     # Create a new site (this way we know it won't have any forecasts yet).
-    client = ClientSQL(client_name=str(uuid.uuid4()))
-    session.add(client)
-    session.commit()
-
-    site = SiteSQL(client_uuid=client.client_uuid, ml_id=hash(uuid.uuid4()) % 2147483647)
+    site = SiteSQL(ml_id=hash(uuid.uuid4()) % 2147483647)
     session.add(site)
     session.commit()
     return site

diff --git a/forecast-inference/forecast_inference/app.py b/forecast-inference/forecast_inference/app.py
@@ -3,6 +3,7 @@
 """
 
 import datetime as dt
+import importlib.metadata
 import logging
 import os
 import pathlib
@@ -11,6 +12,7 @@
 import click
 import dotenv
 import numpy as np
+import sentry_sdk
 from psp.models.base import PvSiteModel
 from psp.typings import PvId, Timestamp, X
 from pvsite_datamodel.connection import DatabaseConnection
@@ -23,6 +25,15 @@
 
 _log = logging.getLogger(__name__)
 
+version = importlib.metadata.version("forecast_inference")
+
+sentry_sdk.init(
+    dsn=os.getenv("SENTRY_DSN"), environment=os.getenv("ENVIRONMENT", "local"), traces_sample_rate=1
+)
+
+sentry_sdk.set_tag("app_name", "pv-site-production_forecast_inferance")
+sentry_sdk.set_tag("version", version)
+
 
 def _run_model_and_save_for_one_pv(
     database_connection: DatabaseConnection,

diff --git a/forecast-inference/poetry.lock b/forecast-inference/poetry.lock
diff --git a/forecast-inference/pyproject.toml b/forecast-inference/pyproject.toml
@@ -13,7 +13,8 @@ python-dotenv = "^0.21.1"
 sqlalchemy = ">=2.0"
 pv-site-prediction = ">=0.1.19"
 pvsite-datamodel = "^1.0.28"
-
+sentry-sdk = "^2.1.1"
+setuptools = "^75.1.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest-cov = "^4.0.0"
@@ -29,6 +30,7 @@ mypy = "^1.2.0"
 freezegun = "^1.2.2"
 jupyter = "^1.0.0"
 altair = "^4.2.2"
+setuptools = "^75.1.0"
 
 [build-system]
 requires = ["poetry-core"]