artesian-sdk 3.1.2.dev3__tar.gz → 3.1.3__tar.gz

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/.github/workflows/python-tests.yml

@@ -36,6 +36,14 @@ jobs:
       run: |
         flake8 .
 
+    - uses: jordemort/action-pyright@v1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        reporter: github-check
+        lib: 
+        level: warning
+        filter_mode: file
+
     - name: Test Pytest
       run: |
         pytest --junitxml=junit/test-results-${{ matrix.python-version }}.xml

artesian-sdk-3.1.3/.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+        "ms-python.flake8",
+        "github.vscode-github-actions",
+        "ms-python.vscode-pylance",
+        "ms-python.python",
+        "ms-python.debugpy",
+        "ms-python.black-formatter"
+    ]
+}

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/.vscode/settings.json

@@ -2,11 +2,9 @@
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
   "editor.fontSize": 16,
-  "python.formatting.provider": "none",
-  "python.linting.flake8Enabled": true,
   "editor.formatOnPaste": true,
   "editor.formatOnSave": true,
   "[python]": {
     "editor.defaultFormatter": "ms-python.black-formatter"
   }
-}
+}

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 3.1.2.dev3
+Version: 3.1.3
 Summary: Library provides read access to the Artesian API
 Author-email: ARK Lab <arklab@ark-energy.eu>
 Maintainer-email: ARK Lab <arklab@ark-energy.eu>
@@ -834,6 +834,29 @@ pageSize = 100
 res = mds.readCurveRange(100042422, page, pageSize, versionFrom="2016-12-20" , versionTo="2019-03-12")
 ```
 
+### Search the MarketData collection with faceted results
+
+Using MarketDataService is possible to query and search the MarketData collection with faceted results. Supports paging, filtering and free text.
+
+```Python
+from Artesian.MarketData import MarketDataService
+
+mds = MarketDataService(cfg)
+
+```
+
+To list MarketData curves
+
+```Python
+page = 1
+pageSize = 100
+searchText = "Riconsegnato_"
+filters = {"ProviderName": ["SNAM", "France"]}
+sorts=["MarketDataId asc"]
+doNotLoadAdditionalInfo=True
+res = mds.searchFacet(page, pageSize, searchText, filters, sorts, doNotLoadAdditionalInfo)
+```
+
 ## Jupyter Support
 
 Artesian SDK uses asyncio internally, this causes a conflict with Jupyter. You can work around this issue by add the following at the beginning of the notebook.

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/README.md

@@ -780,6 +780,29 @@ pageSize = 100
 res = mds.readCurveRange(100042422, page, pageSize, versionFrom="2016-12-20" , versionTo="2019-03-12")
 ```
 
+### Search the MarketData collection with faceted results
+
+Using MarketDataService is possible to query and search the MarketData collection with faceted results. Supports paging, filtering and free text.
+
+```Python
+from Artesian.MarketData import MarketDataService
+
+mds = MarketDataService(cfg)
+
+```
+
+To list MarketData curves
+
+```Python
+page = 1
+pageSize = 100
+searchText = "Riconsegnato_"
+filters = {"ProviderName": ["SNAM", "France"]}
+sorts=["MarketDataId asc"]
+doNotLoadAdditionalInfo=True
+res = mds.searchFacet(page, pageSize, searchText, filters, sorts, doNotLoadAdditionalInfo)
+```
+
 ## Jupyter Support
 
 Artesian SDK uses asyncio internally, this causes a conflict with Jupyter. You can work around this issue by add the following at the beginning of the notebook.

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/pyproject.toml

@@ -155,4 +155,11 @@ python_files = "Test*.py"
 testpaths = [
     "tests"
 ]
-addopts = "--doctest-modules --junitxml=junit/test-results.xml --cov=src --cov-report=xml --cov-report=html"
+addopts = "--doctest-modules --junitxml=junit/test-results.xml --cov=src --cov-report=xml --cov-report=html"
+
+[tool.pyright]
+include = ["src"]
+exclude = [
+  "**/node_modules",
+  "**/__pycache__"
+]

artesian-sdk-3.1.3/samples/TestSearchFacet.py

@@ -0,0 +1,28 @@
+from Artesian import ArtesianConfig
+from Artesian.MarketData import *
+
+cfg = ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey")
+mkdservice = MarketDataService(cfg)
+
+res = (
+    mkdservice.searchFacet(1, 1, "Riconsegnato_", filters={
+        "ProviderName": ["SNAM", "France"]
+        }
+        , sorts=["MarketDataId asc"], doNotLoadAdditionalInfo=False)
+)
+
+print(res.results)
+
+res1 = (
+    mkdservice.searchFacet(1, 1, "Riconsegnato_")
+)
+
+print(res1.results)
+
+res2 = (
+    mkdservice.searchFacet(1, 1, "Riconsegnato_", doNotLoadAdditionalInfo=True)
+)
+
+print(res2.results)
+
+print("Test completed")

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/Exceptions.py

@@ -125,7 +125,7 @@ class ArtesianSdkOptimisticConcurrencyException(ArtesianSdkRemoteException):
     """
 
     def __init__(
-        self: ArtesianSdkValidationException,
+        self: ArtesianSdkOptimisticConcurrencyException,
         method: str,
         url: str,
         statusCode: int,

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/GMEPublicOffers/GMEPublicOfferQuery.py

@@ -15,7 +15,6 @@ from ._Enum.UnitType import UnitType
 from ._Enum.Zone import Zone
 import asyncio
 from urllib import parse
-import itertools
 
 
 class GMEPublicOfferQuery:
@@ -209,8 +208,8 @@ class GMEPublicOfferQuery:
         Returns:
             list of GMEPublicOffers.
         """
-        urls = self.__buildRequest()
-        return self._exec(urls)
+        url = self.__buildRequest()
+        return self._exec(url)
 
     async def executeAsync(self: GMEPublicOfferQuery) -> Any:
         """
@@ -219,13 +218,12 @@ class GMEPublicOfferQuery:
         Returns:
             Enumerable of TimeSerieRow Actual.
         """
-        urls = self.__buildRequest()
-        return await self._execAsync(urls)
+        url = self.__buildRequest()
+        return await self._execAsync(url)
 
     def __buildRequest(self: GMEPublicOfferQuery) -> str:
         self._validateQuery()
         qp = self._queryParameters
-        urls = []
 
         url = "/{0}/{1}/{2}/{3}?_=1".format(
             self.__routePrefix,
@@ -281,9 +279,7 @@ class GMEPublicOfferQuery:
             enc = parse.quote_plus(baType)
             url = url + "&baType=" + enc
 
-        urls.append(url)
-
-        return urls
+        return url
 
     def __getScope(self: GMEPublicOfferQuery, scope: Scope) -> str:
         switcher = {
@@ -352,14 +348,19 @@ class GMEPublicOfferQuery:
             raise Exception("Not supported Market")
         return vr
 
-    def __getPurpose(self: GMEPublicOfferQuery, purpose: Purpose) -> str:
+    def __getPurpose(self: GMEPublicOfferQuery, purpose: Purpose | None) -> str:
+        if purpose is None:
+            raise Exception("Not supported Purpose")
         switcher = {Purpose.BID: "BID", Purpose.OFF: "OFF"}
         vr = switcher.get(purpose, "Defpurp")
         if vr == "Defpurp":
             raise Exception("Not supported Purpose")
         return vr
 
-    def __getStatus(self: GMEPublicOfferQuery, status: Status) -> str:
+    def __getStatus(self: GMEPublicOfferQuery, status: Status | None) -> str:
+        if status is None:
+            raise Exception("Not supported Status")
+
         switcher = {
             Status.ACC: "ACC",
             Status.INC: "INC",
@@ -433,27 +434,19 @@ class GMEPublicOfferQuery:
         subPath = f"{self.__toUrlParam(queryParamaters.extractionRangeConfig.date)}"
         return subPath
 
-    def _buildExtractionStatus(self: GMEPublicOfferQuery, status: Status) -> str:
-        subPath = f"{parse.quote_plus(status)}"
-        return subPath
-
-    def _buildExtractionPurpose(self: GMEPublicOfferQuery, purpose: Purpose) -> str:
-        subPath = f"{parse.quote_plus(purpose)}"
-        return subPath
-
-    def _exec(self: GMEPublicOfferQuery, urls: List[str]) -> list:
+    def _exec(self: GMEPublicOfferQuery, url: str) -> Any:
         loop = get_event_loop()
-        rr = loop.run_until_complete(self._execAsync(urls))
+        rr = loop.run_until_complete(self._execAsync(url))
         return rr
 
-    async def _execAsync(self: GMEPublicOfferQuery, urls: List[str]) -> list:
+    async def _execAsync(self: GMEPublicOfferQuery, url: str) -> Any:
         with self.__client as c:
             res = await asyncio.gather(
-                *[self.__executor.exec(c.exec, "GET", i, None) for i in urls]
+                *[self.__executor.exec(c.exec, "GET", url, None)]
             )
-            return list(itertools.chain(*res))
+            return res[0]
 
-    def __toUrlParam(self: GMEPublicOfferQuery, date: str) -> str:
+    def __toUrlParam(self: GMEPublicOfferQuery, date: str | None) -> str:
         return f"{date}"
 
     def _validateQuery(self: GMEPublicOfferQuery) -> None:

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/MarketData/MarketDataService.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
-from typing import Optional, cast
+from typing import List, Optional, cast, Dict
 from .._ClientsExecutor.RequestExecutor import _RequestExecutor
 from .._ClientsExecutor.Client import _Client
 from ..ArtesianConfig import ArtesianConfig
 from ..ArtesianPolicyConfig import ArtesianPolicyConfig
 from ._Dto.PagedResult import PagedResultCurveRangeEntity
+from ._Dto.ArtesianSearchResults import ArtesianSearchResults
 from ._Dto.MarketDataEntityInput import MarketDataEntityInput
 from ._Dto.MarketDataEntityOutput import MarketDataEntityOutput
 from ._Dto.UpsertData import UpsertData
@@ -113,6 +114,91 @@ class MarketDataService:
             )
         )
 
+    async def searchFacetAsync(
+        self: MarketDataService,
+        page: int,
+        pageSize: int,
+        searchText: str | None = None,
+        filters: Optional[Dict[str, List[str]]] = None,
+        sorts: Optional[List[str]] = None,
+        doNotLoadAdditionalInfo: bool = False,
+    ) -> ArtesianSearchResults:
+        """
+        Search the MarketData collection with faceted results.
+
+        Args:
+            searchText: SearchText parameter.
+            page: int of the page number (1-based).
+            pageSize: int of the pagesize.
+            filters: ArtesianSearchFilter containing the search params.
+            sorts: Sorts list.
+            doNotLoadAdditionalInfo: Skip loading up-to-date curve range and transform.
+
+        Returns:
+            ArtesianSearchResults entity (Async).
+        """
+        filtersList = None
+
+        if filters is not None:
+            filtersList = []
+            for key, values in filters.items():
+                for value in values:
+                    filtersList.append(key + ":" + value)
+
+        url = "/marketdata/searchfacet"
+        params = {}  # needed to avoid typing to detect dict[str,int] ...
+        params["page"] = page
+        params["pageSize"] = pageSize
+        params["searchText"] = searchText
+        if filters is not None:
+            params["filters"] = filtersList
+        if sorts is not None:
+            params["sorts"] = sorts
+        params["doNotLoadAdditionalInfo"] = doNotLoadAdditionalInfo
+
+        with self.__client as c:
+            res = await asyncio.gather(
+                *[
+                    self.__executor.exec(
+                        c.exec,
+                        "GET",
+                        url,
+                        retcls=ArtesianSearchResults,
+                        params=params,
+                    )
+                ]
+            )
+            return cast(ArtesianSearchResults, 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,
+        doNotLoadAdditionalInfo: bool = False,
+    ) -> ArtesianSearchResults:
+        """
+        Search the MarketData collection with faceted results.
+
+        Args:
+            searchText: SearchText parameter.
+            page: int of the page number (1-based).
+            pageSize: int of the pagesize.
+            filters: ArtesianSearchFilter containing the search params.
+            sorts: Sorts list.
+            doNotLoadAdditionalInfo: Skip loading up-to-date curve range and transform.
+
+        Returns:
+            ArtesianSearchResults entity.
+        """
+        return _get_event_loop().run_until_complete(
+            self.searchFacetAsync(
+                page, pageSize, searchText, filters, sorts, doNotLoadAdditionalInfo
+            )
+        )
+
     async def readMarketDataRegistryByIdAsync(
         self: MarketDataService, id: int
     ) -> MarketDataEntityOutput:

artesian-sdk-3.1.3/src/Artesian/MarketData/_Dto/ArtesianMetadataFacet.py

@@ -0,0 +1,33 @@
+from dataclasses import dataclass
+from typing import List, Optional
+from .._Enum import ArtesianMetadataFacetType
+
+
+@dataclass
+class ArtesianMetadataFacetCount:
+    """
+    Class for the ArtesianMetadataFacetCount Entity.
+
+    Attributes:
+        value: the value of the ArtesianMetadataFacet
+        count: the count of ArtesianMetadataFacet
+    """
+
+    value: Optional[str] = None
+    count: int = 0
+
+
+@dataclass
+class ArtesianMetadataFacet:
+    """
+    Class for the Facet Entity.
+
+    Attributes:
+        facetName: the name of the facet
+        facetType: the type of the facet
+        values: list of ArtesianMetadataFacetCount
+    """
+
+    facetName: Optional[str] = None
+    facetType: Optional[ArtesianMetadataFacetType] = None
+    values: Optional[List[ArtesianMetadataFacetCount]] = None

artesian-sdk-3.1.3/src/Artesian/MarketData/_Dto/ArtesianSearchResults.py

@@ -0,0 +1,20 @@
+from dataclasses import dataclass
+from typing import List, Optional
+from .MarketDataEntityOutput import MarketDataEntityOutput
+from .ArtesianMetadataFacet import ArtesianMetadataFacet
+
+
+@dataclass
+class ArtesianSearchResults:
+    """
+    Class for the Artesian Search Results.
+
+    Attributes:
+        results: list of MarketDataEntityOutput
+        facets: list of ArtesianMetadataFacet
+        countResults: the count of result
+    """
+
+    results: Optional[List[MarketDataEntityOutput]] = None
+    facets: Optional[List[ArtesianMetadataFacet]] = None
+    countResults: int = 0

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/MarketData/_Dto/__init__.py

@@ -2,6 +2,8 @@ from .MarketDataEntityInput import MarketDataEntityInput
 from .MarketDataEntityOutput import MarketDataEntityOutput
 from .CurveRangeEntity import CurveRangeEntity
 from .PagedResult import PagedResultCurveRangeEntity
+from .ArtesianSearchResults import ArtesianSearchResults
+from .ArtesianMetadataFacet import ArtesianMetadataFacet, ArtesianMetadataFacetCount
 from .MarketDataIdentifier import MarketDataIdentifier
 from .UpsertData import (
     AuctionBidValue,
@@ -22,4 +24,7 @@ __all__ = [
     BidAskValue.__name__,
     MarketAssessmentValue.__name__,
     UpsertData.__name__,
+    ArtesianSearchResults.__name__,
+    ArtesianMetadataFacet.__name__,
+    ArtesianMetadataFacetCount.__name__,
 ]  # type: ignore

artesian-sdk-3.1.3/src/Artesian/MarketData/_Enum/ArtesianMetadataFacetType.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class ArtesianMetadataFacetType(Enum):
+    Property = 0
+    Tag = 1

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/MarketData/_Enum/__init__.py

@@ -1,9 +1,11 @@
 from .AggregationRule import AggregationRule
 from ...Granularity import Granularity
 from .MarketDataType import MarketDataType
+from .ArtesianMetadataFacetType import ArtesianMetadataFacetType
 
 __all__ = [
     AggregationRule.__name__,
     Granularity.__name__,
     MarketDataType.__name__,
+    ArtesianMetadataFacetType.__name__,
 ]  # type: ignore

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/MarketData/__init__.py

@@ -2,6 +2,8 @@ from .MarketDataService import MarketDataService
 from ._Enum.AggregationRule import AggregationRule
 from ..Granularity import Granularity
 from ._Enum.MarketDataType import MarketDataType
+from ._Enum.ArtesianMetadataFacetType import ArtesianMetadataFacetType
+
 from ._Dto import (
     AuctionBids,
     AuctionBidValue,
@@ -13,6 +15,9 @@ from ._Dto import (
     MarketDataIdentifier,
     UpsertData,
     PagedResultCurveRangeEntity,
+    ArtesianSearchResults,
+    ArtesianMetadataFacet,
+    ArtesianMetadataFacetCount,
 )
 
 __all__ = [
@@ -30,4 +35,8 @@ __all__ = [
     MarketDataEntityOutput.__name__,
     MarketDataIdentifier.__name__,
     UpsertData.__name__,
+    ArtesianSearchResults.__name__,
+    ArtesianMetadataFacet.__name__,
+    ArtesianMetadataFacetCount.__name__,
+    ArtesianMetadataFacetType.__name__,
 ]  # type: ignore

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/Query/DefaultPartitionStrategy.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 import copy
-from typing import List
+from typing import List, TypeVar
+
+from ._QueryParameters.QueryParameters import _QueryParameters
 from ._QueryParameters.ActualQueryParameters import ActualQueryParameters
 from ._QueryParameters.VersionedQueryParameters import VersionedQueryParameters
 from ._QueryParameters.AuctionQueryParameters import AuctionQueryParameters
@@ -8,6 +10,9 @@ from ._QueryParameters.MasQueryParameters import MasQueryParameters
 from ._QueryParameters.BidAskQueryParameters import BidAskQueryParameters
 
 
+T = TypeVar("T", bound=_QueryParameters)
+
+
 class DefaultPartitionStrategy:
     """Class for the default strategy to partition Query Parameters."""
 
@@ -89,9 +94,9 @@ class DefaultPartitionStrategy:
         return self._tsPartitionStrategy(bidAskQueryParameters)
 
     def _tsPartitionStrategy(
-        self: DefaultPartitionStrategy, Parameters: List[MasQueryParameters]
-    ) -> List[MasQueryParameters]:
-        res: List[MasQueryParameters] = []
+        self: DefaultPartitionStrategy, Parameters: List[T]
+    ) -> List[T]:
+        res: List[T] = []
         for param in Parameters:
             if param.ids is None:
                 res.append(param)

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/Query/_Query.py

@@ -172,7 +172,7 @@ class _Query:
             )
             return list(itertools.chain(*res))
 
-    def __toUrlParam(self: _Query, start: str, end: str) -> str:
+    def __toUrlParam(self: _Query, start: str | None, end: str | None) -> str:
         return f"{start}/{end}"
 
     def _validateQuery(self: _Query) -> None:

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/Query/_QueryParameters/QueryParameters.py

@@ -40,7 +40,7 @@ class _FillCustomTimeserieStrategy(_FillStrategy):
         return f"fillerK=CustomValue&fillerDV={self.val}"
 
 
-def toQueryParams(vals: List[List[str]]) -> str:
+def toQueryParams(vals: List[List[str | float | int | None]]) -> str:
     filtered = filter(lambda x: x[1], vals)
     stringVals = map(lambda x: [x[0], str(x[1])], filtered)
     joinedEqual = map(lambda x: "=".join(x), stringVals)

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/_ClientsExecutor/ArtesianJsonSerializer.py

@@ -57,7 +57,7 @@ def __artesianDictDeserializer(
     obj: list, cls: type, *args: Any, **kwargs: Any
 ) -> object:
     key, value = get_args(cls)
-    result: Dict[key, value] = {
+    result: Dict[key, value] = {  # type: ignore
         jsons.load(item["Key"], key, *args, **kwargs): jsons.load(
             item["Value"], value, *args, **kwargs
         )

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/Artesian/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.1.2.dev3'
-__version_tuple__ = version_tuple = (3, 1, 2, 'dev3')
+__version__ = version = '3.1.3'
+__version_tuple__ = version_tuple = (3, 1, 3)

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/artesian_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 3.1.2.dev3
+Version: 3.1.3
 Summary: Library provides read access to the Artesian API
 Author-email: ARK Lab <arklab@ark-energy.eu>
 Maintainer-email: ARK Lab <arklab@ark-energy.eu>
@@ -834,6 +834,29 @@ pageSize = 100
 res = mds.readCurveRange(100042422, page, pageSize, versionFrom="2016-12-20" , versionTo="2019-03-12")
 ```
 
+### Search the MarketData collection with faceted results
+
+Using MarketDataService is possible to query and search the MarketData collection with faceted results. Supports paging, filtering and free text.
+
+```Python
+from Artesian.MarketData import MarketDataService
+
+mds = MarketDataService(cfg)
+
+```
+
+To list MarketData curves
+
+```Python
+page = 1
+pageSize = 100
+searchText = "Riconsegnato_"
+filters = {"ProviderName": ["SNAM", "France"]}
+sorts=["MarketDataId asc"]
+doNotLoadAdditionalInfo=True
+res = mds.searchFacet(page, pageSize, searchText, filters, sorts, doNotLoadAdditionalInfo)
+```
+
 ## Jupyter Support
 
 Artesian SDK uses asyncio internally, this causes a conflict with Jupyter. You can work around this issue by add the following at the beginning of the notebook.

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/src/artesian_sdk.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ pyproject.toml
 .github/dependabot.yml
 .github/workflows/dependency-review.yaml
 .github/workflows/python-tests.yml
+.vscode/extensions.json
 .vscode/launch.json
 .vscode/settings.json
 samples/TestActual.py
@@ -15,6 +16,7 @@ samples/TestBidAsk.py
 samples/TestGMEOffers.py
 samples/TestMarketDataService.py
 samples/TestMas.py
+samples/TestSearchFacet.py
 samples/TestVersioned.py
 samples/TestWriteDataAndQueryActual.py
 samples/TestWriteDataAndQueryAuction.py
@@ -43,6 +45,8 @@ src/Artesian/GMEPublicOffers/_Enum/Zone.py
 src/Artesian/GMEPublicOffers/_Enum/__init__.py
 src/Artesian/MarketData/MarketDataService.py
 src/Artesian/MarketData/__init__.py
+src/Artesian/MarketData/_Dto/ArtesianMetadataFacet.py
+src/Artesian/MarketData/_Dto/ArtesianSearchResults.py
 src/Artesian/MarketData/_Dto/CurveRangeEntity.py
 src/Artesian/MarketData/_Dto/MarketDataEntityInput.py
 src/Artesian/MarketData/_Dto/MarketDataEntityOutput.py
@@ -51,6 +55,7 @@ src/Artesian/MarketData/_Dto/PagedResult.py
 src/Artesian/MarketData/_Dto/UpsertData.py
 src/Artesian/MarketData/_Dto/__init__.py
 src/Artesian/MarketData/_Enum/AggregationRule.py
+src/Artesian/MarketData/_Enum/ArtesianMetadataFacetType.py
 src/Artesian/MarketData/_Enum/MarketDataType.py
 src/Artesian/MarketData/_Enum/__init__.py
 src/Artesian/Query/ActualQuery.py

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/tests/TestGMEPO.py

@@ -9,6 +9,8 @@ from Artesian.GMEPublicOffers import (
 from . import helpers
 import unittest
 from urllib.parse import unquote
+from Artesian._ClientsExecutor.ArtesianJsonSerializer import artesianJsonSerialize
+import responses
 
 cfg = ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey")
 
@@ -16,6 +18,20 @@ qs = GMEPublicOfferService(cfg)
 
 
 class TestGMEPO(unittest.TestCase):
+
+    def setUp(self) -> None:
+        self.__baseurl = "https://arkive.artesian.cloud/tenantName//"
+        self.__sampleOutput = dict(
+            Page=1,
+            PageSize=10,
+            Count=0,
+            IsCountPartial=False,
+            Data=[[]],
+        )
+        self.__serializedOutput = artesianJsonSerialize(self.__sampleOutput)
+
+        return super().setUp()
+
     @helpers.TrackGMEPORequests
     def test_Market(self, requests):
         url = (
@@ -87,3 +103,24 @@ class TestGMEPO(unittest.TestCase):
         query = requests.getQs()
         self.assertEqual(query["page"], "1")
         self.assertEqual(query["pageSize"], "100")
+
+    def test_checkreturnedPayload(self):
+        with responses.RequestsMock() as rsps:
+            rsps.add(
+                "GET",
+                self.__baseurl
+                + "gmepublicoffer/v2.0/extract/2024-01-21/BID/ACC?_=1&page=1&pageSize=10",
+                json=self.__sampleOutput,
+                status=200,
+            )
+
+            output = (
+                qs.createQuery()
+                .forDate("2024-01-21")
+                .forStatus(Status.ACC)
+                .forPurpose(Purpose.BID)
+                .withPagination(1, 10)
+                .execute()
+            )
+
+        self.assertEqual(output, self.__sampleOutput)

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/tests/TestMarketDataService.py

@@ -16,6 +16,7 @@ class TestMarketDataServiceMarketData(unittest.IsolatedAsyncioTestCase):
             originalGranularity=Granularity.Day,
             type=MarketDataType.ActualTimeSerie,
             originalTimezone="CET",
+            tags={"PythonTag": ["PythonTagValue1", "PythonTagValue2"]}
         )
         self.__serializedOutput = artesianJsonSerialize(self.__sampleOutput)
         self.__sampleInput = MarketDataEntityInput(
@@ -35,6 +36,23 @@ class TestMarketDataServiceMarketData(unittest.IsolatedAsyncioTestCase):
         self.__curveRangeSerializedOutput = artesianJsonSerialize(
             self.__curveRangeOutput
         )
+        self.__artesianMetadataFacetCount = ArtesianMetadataFacetCount(
+            value="TestValue",
+            count=1
+            )
+        self.__artesianMetadataFacet = ArtesianMetadataFacet(
+                    facetName="TestFacet",
+                    facetType=ArtesianMetadataFacetType.Tag,
+                    values=[self.__artesianMetadataFacetCount],
+                )
+        self.__artesianSearchResults = ArtesianSearchResults(
+            results=[self.__sampleOutput],
+            facets=[self.__artesianMetadataFacet],
+            countResults=1,
+        )
+        self.__artesianSearchResultsSerializedOutput = artesianJsonSerialize(
+            self.__artesianSearchResults
+        )
 
         return super().setUp()
 
@@ -171,3 +189,39 @@ class TestMarketDataServiceMarketData(unittest.IsolatedAsyncioTestCase):
                 params["versionTo"],
             )
             self.assertEqual(output, self.__curveRangeOutput)
+
+    async def test_searchFacetAsync(self):
+        with responses.RequestsMock() as rsps:
+            params = {
+                "page": "1",
+                "pageSize": "2",
+                "searchText": "arktest +curve",
+                "filters": {"Market": ["Italy", "France"]},
+                "sorts": ["FacetName", "FacetType"],
+                "doNotLoadAdditionalInfo": True,
+            }
+            paramsToMatch = {                
+                "page": "1",
+                "pageSize": "2",
+                "searchText": "arktest +curve",
+                "filters": ["Market:Italy", "Market:France"],
+                "sorts": ["FacetName", "FacetType"],
+                "doNotLoadAdditionalInfo": True,
+            }
+
+            rsps.add(
+                "GET",
+                self.__baseurl + "/marketdata/searchfacet",
+                match=[responses.matchers.query_param_matcher(paramsToMatch)],
+                json=self.__artesianSearchResultsSerializedOutput,
+                status=200,
+            )
+            output = await self.__service.searchFacetAsync(
+                int(params["page"]),
+                int(params["pageSize"]),
+                str(params["searchText"]),
+                params["filters"],
+                params["sorts"],
+                bool(params["doNotLoadAdditionalInfo"]),
+            )
+            self.assertEqual(output, self.__artesianSearchResults)

{artesian-sdk-3.1.2.dev3 → artesian-sdk-3.1.3}/tests/helpers.py

@@ -15,7 +15,7 @@ class Qs:
         return dict(
             map(
                 lambda x: x.split("="),
-                unquote(self._mock.call_args.args[0][0]).split("?")[1].split("&"),
+                unquote(urlparse(self._mock.call_args.args[0][0]).query).split("&"),
             )
         )
 
@@ -23,6 +23,23 @@ class Qs:
         return urlparse(self._mock.call_args.args[0][0]).path
 
 
+class QsPO:
+
+    def __init__(self: QsPO, mock: Mock) -> None:
+        self._mock = mock
+
+    def getQs(self: QsPO) -> Dict[str, str]:
+        return dict(
+            map(
+                lambda x: x.split("="),
+                unquote(urlparse(self._mock.call_args.args[0]).query).split("&"),
+            )
+        )
+
+    def getPath(self: Qs) -> str:
+        return urlparse(self._mock.call_args.args[0]).path
+
+
 def TrackRequests(func: Callable) -> Callable[[Any, Qs], None]:
     @patch.object(_Query._Query, "_exec")
     def wrapper(self: Any, mock: Mock) -> None:
@@ -34,6 +51,6 @@ def TrackRequests(func: Callable) -> Callable[[Any, Qs], None]:
 def TrackGMEPORequests(func: Callable) -> Callable[[Any, Qs], None]:
     @patch.object(_GMEPO.GMEPublicOfferQuery, "_exec")
     def wrapper(self: Any, mock: Mock) -> None:
-        func(self, Qs(mock))
+        func(self, QsPO(mock))
 
     return wrapper