artesian-sdk 3.1.2.dev19__tar.gz → 3.1.3.dev5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 3.1.2.dev19
+Version: 3.1.3.dev5
 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>

{artesian-sdk-3.1.2.dev19 → artesian-sdk-3.1.3.dev5}/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 = {
@@ -441,17 +437,17 @@ class GMEPublicOfferQuery:
         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:
         return f"{date}"

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 3.1.2.dev19
+Version: 3.1.3.dev5
 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>

{artesian-sdk-3.1.2.dev19 → artesian-sdk-3.1.3.dev5}/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.dev19 → artesian-sdk-3.1.3.dev5}/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