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

artesian_sdk-4.0.1.dev16/.github/workflows/python-tests.yml

@@ -0,0 +1,89 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Artesian SDK Python
+
+on:
+  push:
+    branches: [master]
+    tags:
+      - 'v[0-9]+\.[0-9]+\.[0-9]+'
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -e ".[dev]"
+
+      - name: Run flake8
+        run: |
+          flake8 .
+
+      # Execute jordemort/action-pyright only into Ubuntu and macOS.
+      # windows started to fail for reviewdog not found. issue opened
+      # https://github.com/jordemort/action-pyright/issues/51
+      - name: Run Pyright
+        if: matrix.os != 'windows-latest'
+        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
+
+      - name: Upload pytest test results
+        uses: actions/upload-artifact@v3
+        with:
+          name: pytest-results-${{ matrix.python-version }}
+          path: junit/test-results-${{ matrix.python-version }}.xml
+        # Use always() to always run this step to publish test results when there are test failures
+        if: ${{ always() }}
+
+  publish:
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      python-version: "3.11"
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up Python ${{ env.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ env.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install build
+      - name: Build package
+        run: |
+          python -m build
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 4.0.0
+Version: 4.0.1.dev16
 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>
@@ -841,7 +841,6 @@ auctionRows = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER',
 
 ```
 
-
 ## Delete Data in Artesian
 
 Using the MarketDataService is possible to delete MarketData and its curves.
@@ -862,7 +861,7 @@ mkservice.deleteMarketData(100042422)
 
 ```
 
-Depending on the Type of the MarketData, the DeletData should be composed as per example below.
+Depending on the Type of the MarketData, the DeletData should be composed as per example below. The timezone is optional: for DateSeries if provided must be equal to MarketData OriginalTimezone Default:MarketData OriginalTimezone. For TimeSeries Default:CET
 
 ### Delete Data in an Actual Time Series
 

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/README.md

@@ -787,7 +787,6 @@ auctionRows = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER',
 
 ```
 
-
 ## Delete Data in Artesian
 
 Using the MarketDataService is possible to delete MarketData and its curves.
@@ -808,7 +807,7 @@ mkservice.deleteMarketData(100042422)
 
 ```
 
-Depending on the Type of the MarketData, the DeletData should be composed as per example below.
+Depending on the Type of the MarketData, the DeletData should be composed as per example below. The timezone is optional: for DateSeries if provided must be equal to MarketData OriginalTimezone Default:MarketData OriginalTimezone. For TimeSeries Default:CET
 
 ### Delete Data in an Actual Time Series
 

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/samples/TestWriteDataAndDeleteActual.py

@@ -45,7 +45,7 @@ res = (
 
 print(res)
 
-#Delete data between 2020-01-01 06:00 and 2020-01-01 18:00
+# Delete data between 2020-01-01 06:00 and 2020-01-01 18:00
 deleteData = Artesian.MarketData.DeleteData(
     ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
     timezone="CET",
@@ -66,5 +66,26 @@ res = (
 
 print(res)
 
-#Delete the curve completely
+
+# Delete data between 2020-01-01 06:00 and 2020-01-01 18:00 without Timezone
+deleteData = Artesian.MarketData.DeleteData(
+    ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
+    rangeStart=datetime(2020, 1, 1, 6),
+    rangeEnd=datetime(2020, 1, 1, 18),
+)
+
+mkdservice.deleteData(deleteData)
+
+res = (
+    query.createActual()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .inTimeZone("CET")
+    .inGranularity(Granularity.Hour)
+    .execute()
+)
+
+print(res)
+
+# Delete the curve completely
 mkdservice.deleteMarketData(registered.marketDataId)

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/samples/TestWriteDataAndDeleteAuction.py

@@ -58,7 +58,7 @@ res = (
 
 print(res)
 
-#Delete data between 2020-01-01 06:00 and 2020-01-01 18:00
+# Delete data between 2020-01-01 06:00 and 2020-01-01 18:00
 deleteData = Artesian.MarketData.DeleteData(
     ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
     timezone="CET",
@@ -78,5 +78,24 @@ res = (
 
 print(res)
 
-#Delete the curve completely
+# Delete data between 2020-01-01 06:00 and 2020-01-01 18:00 without Timezone
+deleteData = Artesian.MarketData.DeleteData(
+    ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
+    rangeStart=datetime(2020, 1, 1, 6),
+    rangeEnd=datetime(2020, 1, 1, 18),
+)
+
+mkdservice.deleteData(deleteData)
+
+res = (
+    query.createAuction()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .inTimeZone("CET")
+    .execute()
+)
+
+print(res)
+
+# Delete the curve completely
 mkdservice.deleteMarketData(registered.marketDataId)

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/samples/TestWriteDataAndDeleteBidAsk.py

@@ -56,7 +56,7 @@ res = (
 
 print(res)
 
-#Delete data between 2020-01-01 6am and 2020-01-01 6pm for product Feb-18
+# Delete data between 2020-01-01 6am and 2020-01-01 6pm for product Feb-18
 deleteData = Artesian.MarketData.DeleteData(
     ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
     timezone="CET",
@@ -78,5 +78,26 @@ res = (
 
 print(res)
 
-#Delete the curve completely
+# Delete data between 2020-01-01 6am and 2020-01-01 6pm for product Feb-18 without Timezone
+deleteData = Artesian.MarketData.DeleteData(
+    ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
+    rangeStart=datetime(2020, 1, 1, 6),
+    rangeEnd=datetime(2020, 1, 1, 18),
+    product=["Feb-20"]
+)
+
+mkdservice.deleteData(deleteData)
+
+res = (
+    query.createBidAsk()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-31")
+    .forProducts(["Feb-20", "Mar-20"])
+    .inTimeZone("CET")
+    .execute()
+)
+
+print(res)
+
+# Delete the curve completely
 mkdservice.deleteMarketData(registered.marketDataId)

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/samples/TestWriteDataAndDeleteMas.py

@@ -56,7 +56,7 @@ res = (
 
 print(res)
 
-#Delete data with product Feb-20 between 2020-01-01 and 2020-01-03
+# Delete data with product Feb-20 between 2020-01-01 and 2020-01-03
 deleteData = Artesian.MarketData.DeleteData(
     ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
     timezone="CET",
@@ -78,5 +78,26 @@ res = (
 
 print(res)
 
-#Delete the curve completely
+# Delete data with product Feb-20 between 2020-01-01 and 2020-01-03 without Timezone
+deleteData = Artesian.MarketData.DeleteData(
+    ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
+    rangeStart=datetime(2020, 1, 1, 0),
+    rangeEnd=datetime(2020, 1, 3, 0),
+    product=["Feb-20"]
+)
+
+mkdservice.deleteData(deleteData)
+
+res = (
+    query.createMarketAssessment()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .forProducts(["Feb-20", "Mar-20"])
+    .inTimeZone("CET")
+    .execute()
+)
+
+print(res)
+
+# Delete the curve completely
 mkdservice.deleteMarketData(registered.marketDataId)

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/samples/TestWriteDataAndDeleteVersioned.py

@@ -50,7 +50,7 @@ res = (
 
 print(res)
 
-#Delete data between 2020-01-01 06:00 and 2020-01-01 18:00
+# Delete data between 2020-01-01 06:00 and 2020-01-01 18:00
 deleteData = Artesian.MarketData.DeleteData(
     ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
     timezone="CET",
@@ -73,5 +73,27 @@ res = (
 
 print(res)
 
-#Delete the curve completely
+# Delete data between 2020-01-01 06:00 and 2020-01-01 18:00 without Timezone
+deleteData = Artesian.MarketData.DeleteData(
+    ID=Artesian.MarketData.MarketDataIdentifier(registered.providerName, registered.marketDataName),
+    rangeStart=datetime(2020, 1, 1, 6),
+    rangeEnd=datetime(2020, 1, 1, 18),
+    version=testVersion
+)
+
+mkdservice.deleteData(deleteData)
+
+res = (
+    query.createVersioned()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .inTimeZone("CET")
+    .inGranularity(Granularity.Hour)
+    .forVersion("2020-01-01T12:00:00")
+    .execute()
+)
+
+print(res)
+
+# Delete the curve completely
 mkdservice.deleteMarketData(registered.marketDataId)

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/src/Artesian/MarketData/_Dto/DeleteData.py

@@ -11,10 +11,11 @@ class DeleteData:
 
     Attributes:
         ID: the MarketDataIdentifier
-        timezone: the Timezone of the rows. Must be the OriginalTimezone
-                  when writing Dates or must be ""UTC"" when writing Times
         rangeStart: LocalDateTime start of the range to be deleted
         rangeEnd: LocalDateTime end of the range to be deleted
+        timezone: For DateSeries if provided must be equal to MarketData
+                  OriginalTimezone Default:MarketData OriginalTimezone.
+                  For TimeSeries Default:CET
         product: The list of Product. Only *,
                  is special character for 'delete all products in the range'
         version: the Version to operate on
@@ -25,9 +26,9 @@ class DeleteData:
     """
 
     ID: MarketDataIdentifier
-    timezone: str
     rangeStart: datetime
     rangeEnd: datetime
+    timezone: Optional[str] = None
     product: Optional[List[str]] = None
     version: Optional[datetime] = None
     deferCommandExecution: bool = False

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artesian-sdk
-Version: 4.0.0
+Version: 4.0.1.dev16
 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>
@@ -841,7 +841,6 @@ auctionRows = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER',
 
 ```
 
-
 ## Delete Data in Artesian
 
 Using the MarketDataService is possible to delete MarketData and its curves.
@@ -862,7 +861,7 @@ mkservice.deleteMarketData(100042422)
 
 ```
 
-Depending on the Type of the MarketData, the DeletData should be composed as per example below.
+Depending on the Type of the MarketData, the DeletData should be composed as per example below. The timezone is optional: for DateSeries if provided must be equal to MarketData OriginalTimezone Default:MarketData OriginalTimezone. For TimeSeries Default:CET
 
 ### Delete Data in an Actual Time Series
 

{artesian_sdk-4.0.0 → artesian_sdk-4.0.1.dev16}/tests/TestMarketDataDeleteData.py

@@ -34,7 +34,35 @@ class TestMarketDataServiceDeleteData(unittest.IsolatedAsyncioTestCase):
         }
         delete = DeleteData(
             MarketDataIdentifier("PROVIDER", "CURVENAME"),
-            "CET",
+            timezone="CET",
+            rangeStart=datetime(2020, 1, 1, 1),
+            rangeEnd=datetime(2020, 1, 3, 1),
+        )
+        ser = artesianJsonSerialize(delete)
+        self.assertEqual(ser, expectedJson)
+
+        with responses.RequestsMock() as rsps:
+            rsps.add(
+                "POST",
+                self.__baseurl + "/marketdata/deletedata",
+                match=[responses.matchers.json_params_matcher(expectedJson)],
+                status=200,
+            )
+
+            await self.__service.deleteDataAsync(delete)
+
+            self.assertEqual(len(rsps.calls), 1)
+
+    async def test_deleteDateSerieWithoutTimezone(self):
+        expectedJson = {
+            "ID": {"Provider": "PROVIDER", "Name": "CURVENAME"},
+            "RangeStart": "2020-01-01T01:00:00.000000",
+            "RangeEnd": "2020-01-03T01:00:00.000000",
+            "DeferCommandExecution": False,
+            "DeferDataGeneration": True,
+        }
+        delete = DeleteData(
+            MarketDataIdentifier("PROVIDER", "CURVENAME"),
             rangeStart=datetime(2020, 1, 1, 1),
             rangeEnd=datetime(2020, 1, 3, 1),
         )
@@ -65,7 +93,37 @@ class TestMarketDataServiceDeleteData(unittest.IsolatedAsyncioTestCase):
         }
         delete = DeleteData(
             MarketDataIdentifier("PROVIDER", "CURVENAME"),
-            "CET",
+            timezone="CET",
+            product=["Jan-15"],
+            rangeStart=datetime(2020, 1, 1, 1),
+            rangeEnd=datetime(2020, 1, 3, 1),
+        )
+        ser = artesianJsonSerialize(delete)
+        self.assertEqual(ser, expectedJson)
+
+        with responses.RequestsMock() as rsps:
+            rsps.add(
+                "POST",
+                self.__baseurl + "/marketdata/deletedata",
+                match=[responses.matchers.json_params_matcher(expectedJson)],
+                status=200,
+            )
+
+            await self.__service.deleteDataAsync(delete)
+
+            self.assertEqual(len(rsps.calls), 1)
+
+    async def test_deleteDateSerieWithProductWithoutTimezone(self):
+        expectedJson = {
+            "ID": {"Provider": "PROVIDER", "Name": "CURVENAME"},
+            "Product": ["Jan-15"],
+            "RangeStart": "2020-01-01T01:00:00.000000",
+            "RangeEnd": "2020-01-03T01:00:00.000000",
+            "DeferCommandExecution": False,
+            "DeferDataGeneration": True,
+        }
+        delete = DeleteData(
+            MarketDataIdentifier("PROVIDER", "CURVENAME"),
             product=["Jan-15"],
             rangeStart=datetime(2020, 1, 1, 1),
             rangeEnd=datetime(2020, 1, 3, 1),
@@ -97,7 +155,37 @@ class TestMarketDataServiceDeleteData(unittest.IsolatedAsyncioTestCase):
         }
         delete = DeleteData(
             MarketDataIdentifier("PROVIDER", "CURVENAME"),
-            "CET",
+            timezone="CET",
+            rangeStart=datetime(2020, 1, 1, 1),
+            rangeEnd=datetime(2020, 1, 3, 1),
+            version=datetime(2020, 1, 1, 1)
+        )
+        ser = artesianJsonSerialize(delete)
+        self.assertEqual(ser, expectedJson)
+
+        with responses.RequestsMock() as rsps:
+            rsps.add(
+                "POST",
+                self.__baseurl + "/marketdata/deletedata",
+                match=[responses.matchers.json_params_matcher(expectedJson)],
+                status=200,
+            )
+
+            await self.__service.deleteDataAsync(delete)
+
+            self.assertEqual(len(rsps.calls), 1)
+
+    async def test_deleteVersionedSerieWithoutTimezone(self):
+        expectedJson = {
+            "ID": {"Provider": "PROVIDER", "Name": "CURVENAME"},
+            "Version": "2020-01-01T01:00:00.000000",
+            "RangeStart": "2020-01-01T01:00:00.000000",
+            "RangeEnd": "2020-01-03T01:00:00.000000",
+            "DeferCommandExecution": False,
+            "DeferDataGeneration": True,
+        }
+        delete = DeleteData(
+            MarketDataIdentifier("PROVIDER", "CURVENAME"),
             rangeStart=datetime(2020, 1, 1, 1),
             rangeEnd=datetime(2020, 1, 3, 1),
             version=datetime(2020, 1, 1, 1)

artesian_sdk-4.0.0/.github/workflows/python-tests.yml

@@ -1,87 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Artesian SDK Python 
-
-on:
-  push:
-    branches: [ master ]
-    tags:    
-    - 'v[0-9]+\.[0-9]+\.[0-9]+'
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    
-    strategy:
-      matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
-        os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -e ".[dev]"
-
-    - name: Run flake8
-      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
-
-    - name: Upload pytest test results
-      uses: actions/upload-artifact@v3
-      with:
-        name: pytest-results-${{ matrix.python-version }}
-        path: junit/test-results-${{ matrix.python-version }}.xml
-      # Use always() to always run this step to publish test results when there are test failures
-      if: ${{ always() }}
-
-  publish:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
-    runs-on: ubuntu-latest
-    needs: build
-    env:
-      python-version: '3.11'     
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Set up Python ${{ env.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ env.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install build
-    - name: Build package
-      run: |
-        python -m build
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
-      
-