artesian-sdk 4.0.1.dev16__tar.gz → 4.0.2__tar.gz

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/.github/workflows/dependency-review.yaml

@@ -11,7 +11,7 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
         with:
           # Use comma-separated names to pass list arguments:
           allow-licenses: MIT,Apache-2.0

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/.github/workflows/python-tests.yml

@@ -21,9 +21,9 @@ jobs:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -50,13 +50,13 @@ jobs:
 
       - name: Test Pytest
         run: |
-          pytest --junitxml=junit/test-results-${{ matrix.python-version }}.xml
+          pytest --junitxml=junit/test-results-${{ matrix.python-version }}-${{ matrix.os }}.xml
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: pytest-results-${{ matrix.python-version }}
-          path: junit/test-results-${{ matrix.python-version }}.xml
+          name: pytest-results-${{ matrix.python-version }}-${{ matrix.os }}
+          path: junit/test-results-${{ matrix.python-version }}-${{ matrix.os }}.xml
         # Use always() to always run this step to publish test results when there are test failures
         if: ${{ always() }}
 
@@ -68,11 +68,11 @@ jobs:
       python-version: "3.11"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ env.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.python-version }}
       - name: Install dependencies

artesian_sdk-4.0.2/CODEOWNERS

@@ -0,0 +1 @@
+* @ARKlab/team-teapot418 @ARKlab/maintainers

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 4.0.1.dev16
+Version: 4.0.2
 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-4.0.2/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>ARKlab/renovate-config"
+  ]
+}

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/src/Artesian/GMEPublicOffers/GMEPublicOfferQuery.py

@@ -115,19 +115,19 @@ class GMEPublicOfferQuery:
         self._queryParameters.unit = unit
         return self
 
-    def forOperator(
-        self: GMEPublicOfferQuery, operator: List[str]
+    def forOperators(
+        self: GMEPublicOfferQuery, operators: List[str]
     ) -> GMEPublicOfferQuery:
         """
         Set the operators to be queried.
 
         Args:
-            operator: string for the GME Public Offer operator to be queried.
+            operators: string for the GME Public Offer operators to be queried.
 
         Returns:
             GMEPublicOfferQuery.
         """
-        self._queryParameters.operator = operator
+        self._queryParameters.operators = operators
         return self
 
     def forZone(self: GMEPublicOfferQuery, zone: List[Zone]) -> GMEPublicOfferQuery:
@@ -258,11 +258,11 @@ class GMEPublicOfferQuery:
             )
             enc = parse.quote_plus(generationType)
             url = url + "&generationType=" + enc
-        if not (qp.operator is None):
+        if not (qp.operators is None):
             sep = ","
-            operator = sep.join(map(str, qp.operator))
-            enc = parse.quote_plus(operator)
-            url = url + "&operator=" + enc
+            operators = sep.join(map(str, qp.operators))
+            enc = parse.quote_plus(operators)
+            url = url + "&operators=" + enc
         if not (qp.zone is None):
             sep = ","
             zone = sep.join(map(lambda x: self.__getZone(x), qp.zone))
@@ -342,6 +342,8 @@ class GMEPublicOfferQuery:
             Market.MIA1: "MIA1",
             Market.MIA2: "MIA2",
             Market.MIA3: "MIA3",
+            Market.MRR: "MRR",
+            Market.AFRR: "AFRR",
         }
         vr = switcher.get(market, "DefMarket")
         if vr == "DefMarket":

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/src/Artesian/GMEPublicOffers/GMEPublicOfferQueryParameters.py

@@ -20,7 +20,7 @@ class _GMEPublicOfferQueryParameters:
         status: sets the Status to be queried.
         unitType: sets the unit types to be queried.
         generationType: that sets the generation type to be queried.
-        operator: sets the operators to be queried.
+        operators: sets the operators to be queried.
         unit: sets the units to be queried.
         zone: sets the zones to be queried.
         market: sets the Market to be queried.
@@ -39,7 +39,7 @@ class _GMEPublicOfferQueryParameters:
         status: Optional[Status] = None,
         unitType: Optional[List[UnitType]] = None,
         generationType: Optional[List[GenerationType]] = None,
-        operator: Optional[List[str]] = None,
+        operators: Optional[List[str]] = None,
         unit: Optional[List[str]] = None,
         zone: Optional[List[Zone]] = None,
         market: Optional[List[Market]] = None,
@@ -57,7 +57,7 @@ class _GMEPublicOfferQueryParameters:
             status:An enum that sets the Status to be queried.
             unitType: An enum that sets the unit types to be queried.
             generationType: An enum that sets the generation type to be queried.
-            operator: A string that sets the operators to be queried.
+            operators: A string that sets the operators to be queried.
             unit: A string that sets the units to be queried.
             zone: An enum that sets the zones to be queried.
             market: An enum that sets the Market to be queried.
@@ -72,7 +72,7 @@ class _GMEPublicOfferQueryParameters:
         self.status = status
         self.unitType = unitType
         self.generationType = generationType
-        self.operator = operator
+        self.operators = operators
         self.unit = unit
         self.zone = zone
         self.market = market

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/src/Artesian/Query/VersionedQuery.py

@@ -376,7 +376,7 @@ class VersionedQuery(_Query):
                 enc = parse.quote_plus(ids)
                 url = url + "&id=" + enc
             if not (qp.filterId is None):
-                url = url + "&filterId=" + "qp.filterId"
+                url = url + "&filterId=" + str(qp.filterId)
             if not (qp.timezone is None):
                 url = url + "&tz=" + qp.timezone
             if not (qp.transformId is None):

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/src/Artesian/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.0.1.dev16'
-__version_tuple__ = version_tuple = (4, 0, 1, 'dev16')
+__version__ = version = '4.0.2'
+__version_tuple__ = version_tuple = (4, 0, 2)

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/src/artesian_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 4.0.1.dev16
+Version: 4.0.2
 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-4.0.1.dev16 → artesian_sdk-4.0.2}/src/artesian_sdk.egg-info/SOURCES.txt

@@ -1,9 +1,11 @@
 .flake8
 .gitignore
+CODEOWNERS
 CONTRIBUTING.md
 LICENSE
 README.md
 pyproject.toml
+renovate.json
 .github/dependabot.yml
 .github/workflows/dependency-review.yaml
 .github/workflows/python-tests.yml

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/tests/TestActual.py

@@ -37,6 +37,7 @@ class TestActual(unittest.TestCase):
         )
 
         self.assertEqual(requests.getQs()["fillerK"], "NoFill")
+        self.assertEqual(requests.getQs()["filterId"], "1003")
 
     @helpers.TrackRequests
     def test_Latest_Fill(self, requests):

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/tests/TestGMEPO.py

@@ -88,6 +88,20 @@ class TestGMEPO(unittest.TestCase):
         query = requests.getQs()
         self.assertEqual(query["zone"], "NORD,SUD")
 
+    @helpers.TrackGMEPORequests
+    def test_Operator(self, requests):
+        url = (
+            qs.createQuery()
+            .forDate("2020-04-01")
+            .forOperators(["Test"])
+            .forStatus(Status.ACC)
+            .forPurpose(Purpose.BID)
+            .execute()
+        )
+
+        query = requests.getQs()
+        self.assertEqual(query["operators"], "Test")
+
     @helpers.TrackGMEPORequests
     def test_Pagination(self, requests):
         url = (

{artesian_sdk-4.0.1.dev16 → artesian_sdk-4.0.2}/tests/TestVersioned.py

@@ -60,6 +60,7 @@ class TestVersioned(unittest.TestCase):
         self.assertEqual(query["fillerK"], "LatestValidValue")
         self.assertEqual(query["fillerP"], "P5D")
         self.assertEqual(query["fillerC"], "False")
+        self.assertEqual(query["filterId"], "1003")
 
     @helpers.TrackRequests
     def test_Latest_Fill_Continue(self: TestVersioned, requests: Qs) -> None: