Fix to use with pv site production (#32)

* Make the sqlalchemy dependency more flexible * Expose types * add site relationship on GenerationSQL Co-authored-by: Simon Lemieux <[email protected]>
openclimatefix · Jan 27, 2023 · b823474 · b823474
1 parent ab7478b
commit b823474
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/sdk/python/pvsite_datamodel/py.typed b/sdk/python/pvsite_datamodel/py.typed
diff --git a/sdk/python/pvsite_datamodel/sqlmodels.py b/sdk/python/pvsite_datamodel/sqlmodels.py
@@ -2,6 +2,7 @@
 SQLAlchemy definition of the pvsite database schema
 """
 from __future__ import annotations
+
 # This means we can use Typing of objects that have jet to be defined
 
 import uuid
@@ -89,6 +90,7 @@ class GenerationSQL(Base, CreatedMixin):
     datetime_interval: DatetimeIntervalSQL = relationship(
         "DatetimeIntervalSQL", back_populates="generation"
     )
+    site: SiteSQL = relationship("SiteSQL", back_populates="generation")
 
 
 class ForecastSQL(Base, CreatedMixin):

diff --git a/sdk/python/requirements.txt b/sdk/python/requirements.txt
@@ -5,5 +5,5 @@ psycopg2-binary==2.9.5
 pytest==7.2.1
 python-dateutil==2.8.2
 setuptools==65.6.3
-SQLAlchemy==1.4.44
+SQLAlchemy >= 1.4.44, == 1.4.*
 testcontainers==3.7.1
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
@@ -7,4 +7,5 @@
 setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
+    package_data={"pvsite_datamodel": ["pvsite-datamodel/py.typed"]},
 )
diff --git a/sdk/python/tests/test_read.py b/sdk/python/tests/test_read.py
@@ -112,6 +112,7 @@ def test_gets_generation_for_single_input_site(self, generations, db_session):
 
         assert len(generations) == 10
         assert generations[0].datetime_interval is not None
+        assert generations[0].site is not None
 
     def test_gets_generation_for_multiple_input_sites(self, generations, db_session):
         query: Query = db_session.query(SiteSQL)