tol-sdk 1.7.1__tar.gz → 1.7.3__tar.gz

{tol_sdk-1.7.1/src/tol_sdk.egg-info → tol_sdk-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tol-sdk
-Version: 1.7.1
+Version: 1.7.3
 Summary: SDK for interaction with ToL, Sanger and external services
 Author-email: ToL Platforms Team <tol-platforms@sanger.ac.uk>
 License: MIT

{tol_sdk-1.7.1 → tol_sdk-1.7.3}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tol-sdk"
-version = "1.7.1"
+version = "1.7.3"
 description = "SDK for interaction with ToL, Sanger and external services"
 readme = "README.md"
 authors = [

{tol_sdk-1.7.1 → tol_sdk-1.7.3}/src/tol/api_client/client.py

@@ -392,7 +392,7 @@ class JsonApiClient(HttpClient):
         return r.json()
 
     def __detail_url(self, object_type: str, object_id: str) -> str:
-        return f'{self.__data_url}/{object_type}/{quote(object_id)}'
+        return f'{self.__data_url}/{object_type}/{quote(str(object_id))}'
 
     def __list_url(self, object_type: str) -> str:
         return f'{self.__data_url}/{object_type}'
@@ -424,7 +424,7 @@ class JsonApiClient(HttpClient):
 
         hop_string = '/'.join(relationship_hops)
         base_url = (
-            f'{self.__data_url}/{object_type}:to-one/{quote(object_id)}'
+            f'{self.__data_url}/{object_type}:to-one/{quote(str(object_id))}'
         )
         return f'{base_url}/{hop_string}'
 
@@ -434,9 +434,8 @@ class JsonApiClient(HttpClient):
         object_id: str,
         relationship_name: str
     ) -> str:
-
         base_url = (
-            f'{self.__data_url}/{object_type}:to-many/{quote(object_id)}'
+            f'{self.__data_url}/{object_type}:to-many/{quote(str(object_id))}'
         )
         return f'{base_url}/{relationship_name}'
 

{tol_sdk-1.7.1 → tol_sdk-1.7.3}/src/tol/sql/standard/factory.py

@@ -37,6 +37,7 @@ class StandardModels(IterableABC[type[Model]]):
     data_source_config: type[Model]
     data_source_config_attribute: type[Model]
     data_source_config_relationship: type[Model]
+    data_source_config_summary: type[Model]
     component: type[Model]
     component_zone: type[Model]
     zone: type[Model]
@@ -61,6 +62,7 @@ class StandardModels(IterableABC[type[Model]]):
                 self.view_board,
                 self.view,
                 self.board,
+                self.data_source_config_summary,
                 self.data_source_config_relationship,
                 self.data_source_config_attribute,
                 self.loader_instance,
@@ -458,7 +460,6 @@ def create_standard_models(
 
         name: Mapped[str] = mapped_column(nullable=False)
         object_type: Mapped[str] = mapped_column(nullable=False)
-        name: Mapped[str] = mapped_column(nullable=False)
         display_name: Mapped[str] = mapped_column(nullable=True)
         description: Mapped[str] = mapped_column(nullable=True)
         available_on_relationships: Mapped[bool] = mapped_column(nullable=False, default=True)
@@ -484,6 +485,53 @@ def create_standard_models(
             foreign_keys=[data_source_config_id]
         )
 
+    class DataSourceConfigSummary(base_model_class):
+        __tablename__ = 'data_source_config_summary'
+
+        id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)  # noqa A003
+
+        source_object_type: Mapped[str] = mapped_column(nullable=False)
+        destination_object_type: Mapped[str] = mapped_column(nullable=True)
+
+        object_filters: Mapped[dict] = mapped_column(
+            JSONB,
+            nullable=False,
+            default={}
+        )
+
+        group_by: Mapped[dict] = mapped_column(
+            JSONB,
+            nullable=False,
+            default=[]
+        )
+
+        stats_fields: Mapped[dict] = mapped_column(
+            JSONB,
+            nullable=False,
+            default=[]
+        )
+
+        stats: Mapped[dict] = mapped_column(
+            JSONB,
+            nullable=False,
+            default=[]
+        )
+
+        prefix: Mapped[str] = mapped_column(
+            nullable=False,
+            default=''
+        )
+
+        data_source_config_id: Mapped[int] = mapped_column(
+            ForeignKey('data_source_config.id'),
+            nullable=False
+        )
+
+        data_source_config: Mapped['DataSourceConfig'] = relationship(  # noqa F821
+            back_populates='data_source_config_summaries',
+            foreign_keys=[data_source_config_id]
+        )
+
     class DataSourceConfig(base_model_class):
         __tablename__ = 'data_source_config'
 
@@ -504,6 +552,10 @@ def create_standard_models(
             back_populates='data_source_config',
             foreign_keys=[DataSourceConfigRelationship.data_source_config_id]
         )
+        data_source_config_summaries: Mapped[list['DataSourceConfigSummary']] = relationship(
+            back_populates='data_source_config',
+            foreign_keys=[DataSourceConfigSummary.data_source_config_id]
+        )
 
     class _UserMixin:
 
@@ -538,6 +590,7 @@ def create_standard_models(
         data_source_config=DataSourceConfig,
         data_source_config_attribute=DataSourceConfigAttribute,
         data_source_config_relationship=DataSourceConfigRelationship,
+        data_source_config_summary=DataSourceConfigSummary,
         component=Component,
         component_zone=ComponentZone,
         zone=Zone,

{tol_sdk-1.7.1 → tol_sdk-1.7.3/src/tol_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tol-sdk
-Version: 1.7.1
+Version: 1.7.3
 Summary: SDK for interaction with ToL, Sanger and external services
 Author-email: ToL Platforms Team <tol-platforms@sanger.ac.uk>
 License: MIT

{tol_sdk-1.7.1 → tol_sdk-1.7.3}/src/tol_sdk.egg-info/SOURCES.txt

@@ -311,8 +311,6 @@ src/tol/sql/pipeline_step/__init__.py
 src/tol/sql/pipeline_step/factory.py
 src/tol/sql/standard/__init__.py
 src/tol/sql/standard/factory.py
-src/tol/sql/summary/__init__.py
-src/tol/sql/summary/factory.py
 src/tol/status/__init__.py
 src/tol/status/status_datasource.py
 src/tol/sts/__init__.py

tol_sdk-1.7.1/src/tol/sql/summary/__init__.py

@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Genome Research Ltd.
-#
-# SPDX-License-Identifier: MIT
-
-
-from .factory import create_summary_models  # noqa F401

tol_sdk-1.7.1/src/tol/sql/summary/factory.py

@@ -1,91 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Genome Research Ltd.
-#
-# SPDX-License-Identifier: MIT
-
-from __future__ import annotations
-
-from collections.abc import Iterable as IterableABC
-from dataclasses import dataclass
-from typing import Iterator
-
-from sqlalchemy.dialects.postgresql import JSONB
-from sqlalchemy.orm import (
-    Mapped,
-    mapped_column
-)
-
-from ..model import Model
-
-
-@dataclass(frozen=True, kw_only=True)
-class SummaryModels(IterableABC[type[Model]]):
-    """
-    Contains the needed models for summarys.
-
-    """
-
-    summary: type[Model]
-
-    def __iter__(self) -> Iterator[type[Model]]:
-        """
-        Returns in order they should be deleted
-        """
-
-        return iter(
-            [
-                self.summary
-            ]
-        )
-
-
-def create_summary_models(
-    base_model_class: type[Model]
-) -> SummaryModels:
-    """
-    Creates all needed models (and joining tables) for
-    summaries.
-
-    Returns a `SummaryModels` instance that functions like an
-    `Iterable`.
-    """
-
-    class Summary(base_model_class):
-        __tablename__ = 'summary'
-
-        id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)  # noqa A003
-
-        source_object_type: Mapped[str] = mapped_column(nullable=False)
-        destination_object_type: Mapped[str] = mapped_column(nullable=True)
-
-        object_filters: Mapped[dict] = mapped_column(
-            JSONB,
-            nullable=False,
-            default={}
-        )
-
-        group_by: Mapped[dict] = mapped_column(
-            JSONB,
-            nullable=False,
-            default=[]
-        )
-
-        stats_fields: Mapped[dict] = mapped_column(
-            JSONB,
-            nullable=False,
-            default=[]
-        )
-
-        stats: Mapped[dict] = mapped_column(
-            JSONB,
-            nullable=False,
-            default=[]
-        )
-
-        prefix: Mapped[str] = mapped_column(
-            nullable=False,
-            default=''
-        )
-
-    return SummaryModels(
-        summary=Summary,
-    )