artesian-sdk 4.3.1.dev2__py3-none-any.whl → 5.0.0.dev2__py3-none-any.whl

Artesian/MarketData/MarketDataService.py

@@ -1,21 +1,23 @@
 from __future__ import annotations
-from typing import List, Optional, cast, Dict
+
+import asyncio
+from typing import cast
 
 from Artesian.MarketData._Dto import DeleteData
 from Artesian.MarketData._Dto.DerivedTransformQueryValidation import DerivedTransformQueryValidation
 from Artesian.MarketData._Dto.DerivedTransformQueryValidationResponse import DerivedTransformQueryValidationResponse
-from ._Dto.DerivedCfg import DerivedCfg
-from .._ClientsExecutor.RequestExecutor import _RequestExecutor
+
 from .._ClientsExecutor.Client import _Client
+from .._ClientsExecutor.RequestExecutor import _RequestExecutor
 from ..ArtesianConfig import ArtesianConfig
 from ..ArtesianPolicyConfig import ArtesianPolicyConfig
-from ._Dto.PagedResult import PagedResultCurveRangeEntity
 from ._Dto.ArtesianSearchResults import ArtesianSearchResults
+from ._Dto.CheckConversionResult import CheckConversionResult
+from ._Dto.DerivedCfg import DerivedCfg
 from ._Dto.MarketDataEntityInput import MarketDataEntityInput
 from ._Dto.MarketDataEntityOutput import MarketDataEntityOutput
-from ._Dto.CheckConversionResult import CheckConversionResult
+from ._Dto.PagedResult import PagedResultCurveRangeEntity
 from ._Dto.UpsertData import UpsertData
-import asyncio
 
 
 class MarketDataService:
@@ -48,10 +50,10 @@ class MarketDataService:
         id: int,
         page: int,
         pageSize: int,
-        product: Optional[str] = None,
-        versionFrom: Optional[str] = None,
-        versionTo: Optional[str] = None,
-    ) -> PagedResultCurveRangeEntity:
+        product: str | None = None,
+        versionFrom: str | None = None,
+        versionTo: str | None = None,
+    ) -> PagedResultCurveRangeEntity | None:
         """
         Reads paged set of available versions of the marketdata by id.
 
@@ -68,7 +70,7 @@ class MarketDataService:
         """
 
         url = "/marketdata/entity/" + str(id) + "/curves"
-        params = {}  # needed to avoid typing to detect dict[str,int] ...
+        params: dict[str, str | int] = {}
         params["page"] = page
         params["pageSize"] = pageSize
         if versionFrom is not None:
@@ -89,17 +91,17 @@ class MarketDataService:
                     )
                 ]
             )
-            return cast(PagedResultCurveRangeEntity, res[0])
+            return cast(PagedResultCurveRangeEntity | None, res[0])
 
     def readCurveRange(
         self: MarketDataService,
         id: int,
         page: int,
         pageSize: int,
-        product: Optional[str] = None,
-        versionFrom: Optional[str] = None,
-        versionTo: Optional[str] = None,
-    ) -> PagedResultCurveRangeEntity:
+        product: str | None = None,
+        versionFrom: str | None = None,
+        versionTo: str | None = None,
+    ) -> PagedResultCurveRangeEntity | None:
         """
         Reads paged set of available versions of the marketdata by id.
 
@@ -115,9 +117,7 @@ class MarketDataService:
             Paged result of CurveRange entity.
         """
         return _get_event_loop().run_until_complete(
-            self.readCurveRangeAsync(
-                id, page, pageSize, product, versionFrom, versionTo
-            )
+            self.readCurveRangeAsync(id, page, pageSize, product, versionFrom, versionTo)
         )
 
     async def searchFacetAsync(
@@ -125,10 +125,10 @@ class MarketDataService:
         page: int,
         pageSize: int,
         searchText: str | None = None,
-        filters: Optional[Dict[str, List[str]]] = None,
-        sorts: Optional[List[str]] = None,
+        filters: dict[str, list[str]] | None = None,
+        sorts: list[str] | None = None,
         doNotLoadAdditionalInfo: bool = False,
-    ) -> ArtesianSearchResults:
+    ) -> ArtesianSearchResults | None:
         """
         Search the MarketData collection with faceted results.
 
@@ -152,7 +152,7 @@ class MarketDataService:
                     filtersList.append(key + ":" + value)
 
         url = "/marketdata/searchfacet"
-        params = {}  # needed to avoid typing to detect dict[str,int] ...
+        params: dict[str, str | int | list[str] | None] = {}
         params["page"] = page
         params["pageSize"] = pageSize
         params["searchText"] = searchText
@@ -174,17 +174,17 @@ class MarketDataService:
                     )
                 ]
             )
-            return cast(ArtesianSearchResults, res[0])
+            return cast(ArtesianSearchResults | None, res[0])
 
     def searchFacet(
         self: MarketDataService,
         page: int,
         pageSize: int,
-        searchText: Optional[str] = None,
-        filters: Optional[Dict[str, List[str]]] = None,
-        sorts: Optional[List[str]] = None,
+        searchText: str | None = None,
+        filters: dict[str, list[str]] | None = None,
+        sorts: list[str] | None = None,
         doNotLoadAdditionalInfo: bool = False,
-    ) -> ArtesianSearchResults:
+    ) -> ArtesianSearchResults | None:
         """
         Search the MarketData collection with faceted results.
 
@@ -200,14 +200,10 @@ class MarketDataService:
             ArtesianSearchResults entity.
         """
         return _get_event_loop().run_until_complete(
-            self.searchFacetAsync(
-                page, pageSize, searchText, filters, sorts, doNotLoadAdditionalInfo
-            )
+            self.searchFacetAsync(page, pageSize, searchText, filters, sorts, doNotLoadAdditionalInfo)
         )
 
-    async def readMarketDataRegistryByIdAsync(
-        self: MarketDataService, id: int
-    ) -> MarketDataEntityOutput:
+    async def readMarketDataRegistryByIdAsync(self: MarketDataService, id: int) -> MarketDataEntityOutput | None:
         """
         Reads MarketData by id with MarketDataID.
 
@@ -219,18 +215,10 @@ class MarketDataService:
         """
         url = "/marketdata/entity/" + str(id)
         with self.__client as c:
-            res = await asyncio.gather(
-                *[
-                    self.__executor.exec(
-                        c.exec, "GET", url, None, retcls=MarketDataEntityOutput
-                    )
-                ]
-            )
-            return cast(MarketDataEntityOutput, res[0])
+            res = await asyncio.gather(*[self.__executor.exec(c.exec, "GET", url, None, retcls=MarketDataEntityOutput)])
+            return cast(MarketDataEntityOutput | None, res[0])
 
-    def readMarketDataRegistryById(
-        self: MarketDataService, id: int
-    ) -> MarketDataEntityOutput:
+    def readMarketDataRegistryById(self: MarketDataService, id: int) -> MarketDataEntityOutput | None:
         """
         Reads MarketData by curve name with MarketDataID.
 
@@ -240,13 +228,11 @@ class MarketDataService:
         Returns:
             MarketData Entity Output.
         """
-        return _get_event_loop().run_until_complete(
-            self.readMarketDataRegistryByIdAsync(id)
-        )
+        return _get_event_loop().run_until_complete(self.readMarketDataRegistryByIdAsync(id))
 
     async def updateMarketDataAsync(
         self: MarketDataService, id: int, entity: MarketDataEntityInput
-    ) -> MarketDataEntityOutput:
+    ) -> MarketDataEntityOutput | None:
         """
         Saves the given MarketData Entity
 
@@ -258,18 +244,12 @@ class MarketDataService:
         """
         url = "/marketdata/entity/" + str(id)
         with self.__client as c:
-            res = await asyncio.gather(
-                *[
-                    self.__executor.exec(
-                        c.exec, "PUT", url, entity, MarketDataEntityOutput
-                    )
-                ]
-            )
-            return cast(MarketDataEntityOutput, res[0])
+            res = await asyncio.gather(*[self.__executor.exec(c.exec, "PUT", url, entity, MarketDataEntityOutput)])
+            return cast(MarketDataEntityOutput | None, res[0])
 
     def updateMarketData(
         self: MarketDataService, id: int, entity: MarketDataEntityInput
-    ) -> MarketDataEntityOutput:
+    ) -> MarketDataEntityOutput | None:
         """
         Saves the given MarketData Entity
 
@@ -279,9 +259,7 @@ class MarketDataService:
         Returns:
             MarketData Entity Output.
         """
-        return _get_event_loop().run_until_complete(
-            self.updateMarketDataAsync(id, entity)
-        )
+        return _get_event_loop().run_until_complete(self.updateMarketDataAsync(id, entity))
 
     async def deleteMarketDataAsync(self: MarketDataService, id: int) -> None:
         """
@@ -296,7 +274,7 @@ class MarketDataService:
         url = "/marketdata/entity/" + str(id)
         with self.__client as c:
             await asyncio.gather(*[self.__executor.exec(c.exec, "DELETE", url, None)])
-            return None
+            return
 
     def deleteMarketData(self: MarketDataService, id: int) -> None:
         """
@@ -312,7 +290,7 @@ class MarketDataService:
 
     async def readMarketDataRegistryByNameAsync(
         self: MarketDataService, provider: str, curveName: str
-    ) -> MarketDataEntityOutput:
+    ) -> MarketDataEntityOutput | None:
         """
         Reads MarketData by provider and curve name.
 
@@ -338,11 +316,11 @@ class MarketDataService:
                     )
                 ]
             )
-            return cast(MarketDataEntityOutput, res[0])
+            return cast(MarketDataEntityOutput | None, res[0])
 
     def readMarketDataRegistryByName(
         self: MarketDataService, provider: str, curveName: str
-    ) -> MarketDataEntityOutput:
+    ) -> MarketDataEntityOutput | None:
         """
         Reads MarketData by provider and curve name.
 
@@ -353,13 +331,11 @@ class MarketDataService:
         Returns:
             MarketData Entity Output.
         """
-        return _get_event_loop().run_until_complete(
-            self.readMarketDataRegistryByNameAsync(provider, curveName)
-        )
+        return _get_event_loop().run_until_complete(self.readMarketDataRegistryByNameAsync(provider, curveName))
 
     async def registerMarketDataAsync(
         self: MarketDataService, entity: MarketDataEntityInput
-    ) -> MarketDataEntityOutput:
+    ) -> MarketDataEntityOutput | None:
         """
         Register a new MarketData entity.
 
@@ -371,18 +347,10 @@ class MarketDataService:
         """
         url = "/marketdata/entity"
         with self.__client as c:
-            res = await asyncio.gather(
-                *[
-                    self.__executor.exec(
-                        c.exec, "POST", url, entity, MarketDataEntityOutput
-                    )
-                ]
-            )
-            return cast(MarketDataEntityOutput, res[0])
+            res = await asyncio.gather(*[self.__executor.exec(c.exec, "POST", url, entity, MarketDataEntityOutput)])
+            return cast(MarketDataEntityOutput | None, res[0])
 
-    def registerMarketData(
-        self: MarketDataService, entity: MarketDataEntityInput
-    ) -> MarketDataEntityOutput:
+    def registerMarketData(self: MarketDataService, entity: MarketDataEntityInput) -> MarketDataEntityOutput | None:
         """
         Register a new MarketData entity.
 
@@ -395,15 +363,11 @@ class MarketDataService:
 
         entity._validateDerivedCfg()
 
-        return _get_event_loop().run_until_complete(
-            self.registerMarketDataAsync(entity)
-        )
+        return _get_event_loop().run_until_complete(self.registerMarketDataAsync(entity))
 
     async def checkConversionAsync(
-        self: MarketDataService,
-        inputUnitsOfMeasure: List[str],
-        targetUnitOfMeasure: str
-    ) -> CheckConversionResult:
+        self: MarketDataService, inputUnitsOfMeasure: list[str], targetUnitOfMeasure: str
+    ) -> CheckConversionResult | None:
         """
         Check UnitOfMeasure conversion.
 
@@ -416,8 +380,7 @@ class MarketDataService:
             CheckConversionResult Entity (Async).
         """
         url = "/uom/checkconversion"
-        params = {"inputUnitsOfMeasure": inputUnitsOfMeasure,
-                  "targetUnitOfMeasure": targetUnitOfMeasure}
+        params = {"inputUnitsOfMeasure": inputUnitsOfMeasure, "targetUnitOfMeasure": targetUnitOfMeasure}
         with self.__client as c:
             res = await asyncio.gather(
                 *[
@@ -431,13 +394,11 @@ class MarketDataService:
                     )
                 ]
             )
-            return cast(CheckConversionResult, res[0])
+            return cast(CheckConversionResult | None, res[0])
 
     def checkConversion(
-        self: MarketDataService,
-        inputUnitsOfMeasure: List[str],
-        targetUnitOfMeasure: str
-    ) -> CheckConversionResult:
+        self: MarketDataService, inputUnitsOfMeasure: list[str], targetUnitOfMeasure: str
+    ) -> CheckConversionResult | None:
         """
         Check UnitOfMeasure conversion.
 
@@ -450,16 +411,11 @@ class MarketDataService:
             CheckConversionResult Entity.
         """
 
-        return _get_event_loop().run_until_complete(
-            self.checkConversionAsync(inputUnitsOfMeasure, targetUnitOfMeasure)
-        )
+        return _get_event_loop().run_until_complete(self.checkConversionAsync(inputUnitsOfMeasure, targetUnitOfMeasure))
 
     async def updateDerivedConfigurationAsync(
-        self: MarketDataService,
-        marketDataId: int,
-        derivedCfg: DerivedCfg,
-        force: bool = False
-    ) -> MarketDataEntityOutput:
+        self: MarketDataService, marketDataId: int, derivedCfg: DerivedCfg, force: bool = False
+    ) -> MarketDataEntityOutput | None:
         """
         Update Derived Configuration for marketData with id supplied in MarketDataId.
         The update will trigger a Rebuild
@@ -476,7 +432,8 @@ class MarketDataService:
 
         marketDataOutput = await self.readMarketDataRegistryByIdAsync(marketDataId)
 
-        marketDataOutput._validateUpdateDerivedCfg(derivedCfgUpdate=derivedCfg)
+        # Preserve the existing AttributeError when the source market-data entity is missing.
+        cast(MarketDataEntityOutput, marketDataOutput)._validateUpdateDerivedCfg(derivedCfgUpdate=derivedCfg)
 
         url = "/marketdata/entity/" + str(marketDataId) + "/updateDerivedConfiguration"
         params = {"force": force}
@@ -493,14 +450,11 @@ class MarketDataService:
                     )
                 ]
             )
-            return cast(MarketDataEntityOutput, res[0])
+            return cast(MarketDataEntityOutput | None, res[0])
 
     def updateDerivedConfiguration(
-        self: MarketDataService,
-        marketDataId: int,
-        derivedCfg: DerivedCfg,
-        force: bool = False
-    ) -> MarketDataEntityOutput:
+        self: MarketDataService, marketDataId: int, derivedCfg: DerivedCfg, force: bool = False
+    ) -> MarketDataEntityOutput | None:
         """
         Update Derived Configuration for marketData with id supplied in MarketDataId.
         The update will trigger a Rebuild
@@ -522,7 +476,7 @@ class MarketDataService:
         url = "/marketdata/upsertdata"
         with self.__client as c:
             await asyncio.gather(*[self.__executor.exec(c.exec, "POST", url, data)])
-            return None
+            return
 
     def upsertData(self: MarketDataService, data: UpsertData) -> None:
         return _get_event_loop().run_until_complete(self.upsertDataAsync(data))
@@ -531,15 +485,14 @@ class MarketDataService:
         url = "/marketdata/deletedata"
         with self.__client as c:
             await asyncio.gather(*[self.__executor.exec(c.exec, "POST", url, data)])
-            return None
+            return
 
     def deleteData(self: MarketDataService, data: DeleteData) -> None:
         return _get_event_loop().run_until_complete(self.deleteDataAsync(data))
 
     async def derivedTransformQueryValidationAsync(
-        self: MarketDataService,
-        request: DerivedTransformQueryValidation
-    ) -> DerivedTransformQueryValidationResponse:
+        self: MarketDataService, request: DerivedTransformQueryValidation
+    ) -> DerivedTransformQueryValidationResponse | None:
         """
         Derived Transform Query Validation.
 
@@ -552,23 +505,14 @@ class MarketDataService:
 
         with self.__client as c:
             res = await asyncio.gather(
-                *[
-                    self.__executor.exec(
-                        c.exec,
-                        "POST",
-                        url,
-                        request,
-                        retcls=DerivedTransformQueryValidationResponse
-                    )
-                ]
+                *[self.__executor.exec(c.exec, "POST", url, request, retcls=DerivedTransformQueryValidationResponse)]
             )
 
-            return cast(DerivedTransformQueryValidationResponse, res[0])
+            return cast(DerivedTransformQueryValidationResponse | None, res[0])
 
     def derivedTransformQueryValidation(
-        self: MarketDataService,
-        request: DerivedTransformQueryValidation
-    ) -> DerivedTransformQueryValidationResponse:
+        self: MarketDataService, request: DerivedTransformQueryValidation
+    ) -> DerivedTransformQueryValidationResponse | None:
         """
         Derived Transform Query Validation.
 
@@ -579,9 +523,7 @@ class MarketDataService:
             DerivedTransformQueryValidationResponse Entity.
         """
 
-        return _get_event_loop().run_until_complete(
-            self.derivedTransformQueryValidationAsync(request)
-        )
+        return _get_event_loop().run_until_complete(self.derivedTransformQueryValidationAsync(request))
 
 
 def _get_event_loop() -> asyncio.AbstractEventLoop:

Artesian/MarketData/_Dto/ArtesianMetadataFacet.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import List, Optional
+
 from .._Enum import ArtesianMetadataFacetType
 
 
@@ -13,7 +13,7 @@ class ArtesianMetadataFacetCount:
         count: the count of ArtesianMetadataFacet
     """
 
-    value: Optional[str] = None
+    value: str | None = None
     count: int = 0
 
 
@@ -28,6 +28,6 @@ class ArtesianMetadataFacet:
         values: list of ArtesianMetadataFacetCount
     """
 
-    facetName: Optional[str] = None
-    facetType: Optional[ArtesianMetadataFacetType] = None
-    values: Optional[List[ArtesianMetadataFacetCount]] = None
+    facetName: str | None = None
+    facetType: ArtesianMetadataFacetType | None = None
+    values: list[ArtesianMetadataFacetCount] | None = None

Artesian/MarketData/_Dto/ArtesianSearchResults.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
-from typing import List, Optional
-from .MarketDataEntityOutput import MarketDataEntityOutput
+
 from .ArtesianMetadataFacet import ArtesianMetadataFacet
+from .MarketDataEntityOutput import MarketDataEntityOutput
 
 
 @dataclass
@@ -15,6 +15,6 @@ class ArtesianSearchResults:
         countResults: the count of result
     """
 
-    results: Optional[List[MarketDataEntityOutput]] = None
-    facets: Optional[List[ArtesianMetadataFacet]] = None
+    results: list[MarketDataEntityOutput] | None = None
+    facets: list[ArtesianMetadataFacet] | None = None
     countResults: int = 0

Artesian/MarketData/_Dto/CheckConversionResult.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import List
 
 
 @dataclass
@@ -15,5 +14,5 @@ class CheckConversionResult:
     """
 
     targetUnitOfMeasure: str
-    convertibleInputUnitsOfMeasure: List[str]
-    notConvertibleInputUnitsOfMeasure: List[str]
+    convertibleInputUnitsOfMeasure: list[str]
+    notConvertibleInputUnitsOfMeasure: list[str]

Artesian/MarketData/_Dto/CurveRangeEntity.py

@@ -1,6 +1,6 @@
-from dataclasses import dataclass
 import datetime
-from typing import Optional
+from dataclasses import dataclass
+
 from dateutil import tz
 
 
@@ -20,9 +20,9 @@ class CurveRangeEntity:
     """
 
     marketDataId: int = 0
-    product: Optional[str] = None
-    version: Optional[str] = None
+    product: str | None = None
+    version: str | None = None
     lastUpdated: datetime.datetime = datetime.datetime.min.replace(tzinfo=tz.UTC)
     created: datetime.datetime = datetime.datetime.min.replace(tzinfo=tz.UTC)
-    rangeStart: Optional[datetime.date] = None
-    rangeEnd: Optional[datetime.date] = None
+    rangeStart: datetime.date | None = None
+    rangeEnd: datetime.date | None = None

Artesian/MarketData/_Dto/DeleteData.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List, Optional
-from Artesian.MarketData._Dto import MarketDataIdentifier
+
+from .MarketDataIdentifier import MarketDataIdentifier
 
 
 @dataclass
@@ -28,8 +28,8 @@ class DeleteData:
     ID: MarketDataIdentifier
     rangeStart: datetime
     rangeEnd: datetime
-    timezone: Optional[str] = None
-    product: Optional[List[str]] = None
-    version: Optional[datetime] = None
+    timezone: str | None = None
+    product: list[str] | None = None
+    version: datetime | None = None
     deferCommandExecution: bool = False
     deferDataGeneration: bool = True

Artesian/MarketData/_Dto/DerivedCfg.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import List, Optional
+
 from .._Enum import DerivedAlgorithm
 
 
@@ -18,5 +18,5 @@ class DerivedCfg:
 
     derivedAlgorithm: DerivedAlgorithm
     version: int
-    orderedReferencedMarketDataIds: Optional[List[int]]
-    transform: Optional[str] = None
+    orderedReferencedMarketDataIds: list[int] | None
+    transform: str | None = None

Artesian/MarketData/_Dto/DerivedTransformQueryValidation.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from .TimeSerieData import TimeSerieData
 
@@ -27,8 +26,8 @@ class DerivedTransformQueryValidation:
     """
 
     data: TimeSerieData
-    transform: Optional[str] = None
+    transform: str | None = None
 
-    def __post_init__(self: "DerivedTransformQueryValidation") -> None:
+    def __post_init__(self) -> None:
         if self.transform is None:
             raise ValueError("transform must be provided for query validation.")

Artesian/MarketData/_Dto/DerivedTransformQueryValidationResponse.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional
+
 from .TimeSerieData import TimeSerieData
 
 
@@ -12,7 +12,7 @@ class Error:
 
     """
 
-    message: Optional[str] = None
+    message: str | None = None
 
 
 @dataclass
@@ -27,4 +27,4 @@ class DerivedTransformQueryValidationResponse:
 
     data: TimeSerieData
     valid: bool
-    error: Optional[Error] = None
+    error: Error | None = None