artesian-sdk 4.2.1.dev2__tar.gz → 4.2.2__tar.gz

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/.flake8

@@ -1,5 +1,5 @@
 [flake8]
-max-line-length = 88
+max-line-length = 120
 extend-ignore = 
     E203,
     E722

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/.github/workflows/dependency-review.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4
         with:

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/.github/workflows/python-tests.yml

@@ -21,9 +21,9 @@ jobs:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -49,7 +49,7 @@ jobs:
           pytest --junitxml=junit/test-results-${{ matrix.python-version }}-${{ matrix.os }}.xml
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: pytest-results-${{ matrix.python-version }}-${{ matrix.os }}
           path: junit/test-results-${{ matrix.python-version }}-${{ matrix.os }}.xml
@@ -64,11 +64,11 @@ jobs:
       python-version: "3.11"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up Python ${{ env.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.python-version }}
       - name: Install dependencies

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: artesian-sdk
-Version: 4.2.1.dev2
+Version: 4.2.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>
@@ -783,8 +783,19 @@ data = MarketData.UpsertData(mkdid, 'CET',
   )
 
 mkservice.upsertData(data)
+```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
 ```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for ActualTimeSeries the two modes are equivalent. Leaving Null/None/Empty is equivalent to Merge.
+
 
 DerivedCfg can be of algorithm type: Coalesce, Sum, Muv.
 
@@ -884,6 +895,37 @@ mkservice.upsertData(data)
 
 ```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for VersionedTimeSeries the merge writes in to the curve replacing existing data for an existing instant, replace writes the payload removing any previous data for the version. Leaving Null/None/Empty is equivalent to Merge.
+
+| DATETIME | EXISTING | PAYLOAD | MERGE | REPALACE |
+|---|---|---|---|---|
+| VERSION NAME | 2025-01-01 | 2025-01-01 | 2025-01-01 | 2025-01-01 |
+| 2025-01-01 |        |        |        |        |
+| 2025-01-02 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-03 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-04 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-05 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-06 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-07 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-08 |        | 222.22 | 222.22 | 222.22 |
+| 2025-01-09 |        |        |        |        |
+| 2025-01-10 |        |        |        |        |
+| 2025-01-11 | 999.99 |        | 999.99 |        |
+| 2025-01-12 | 999.99 |        | 999.99 |        |
+| 2025-01-13 | 999.99 |        | 999.99 |        |
+| 2025-01-14 |        |        |        |        |
+| 2025-01-15 |        |        |        |        |
+
+
 ### Write Data in a Market Assessment Time Series
 
 ```Python
@@ -931,6 +973,18 @@ mkservice.upsertData(marketAssessment)
 
 ```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for MarketAssessment merge adds the new products to the existing and overwrites existing with the new ones while replace replaces all the existing products with the new ones. Leaving Null/None/Empty is equivalent to Merge.
+
+
 ### Write Data in a Bid Ask Time Series
 
 ```Python
@@ -977,6 +1031,18 @@ bidAsk = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER', 'MARK
 mkservice.upsertData(bidAsk)
 ```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for BidAsk merge adds the new products to the existing and overwrites existing with the new ones while replace replaces all the existing products with the new ones. Leaving Null/None/Empty is equivalent to Merge.
+
+
 ### Write Data in an Auction Time Series
 
 ```Python
@@ -1021,8 +1087,19 @@ auctionRows = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER',
 
   mkservice.upsertData(auctionRows)
 
+```
 
+Upsert has optional switches that can be applied
 ```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for Auction merge and replace are equivalent. Leaving Null/None/Empty is equivalent to Merge.
+
 
 ## Delete Data in Artesian
 

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/README.md

@@ -728,8 +728,19 @@ data = MarketData.UpsertData(mkdid, 'CET',
   )
 
 mkservice.upsertData(data)
+```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
 ```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for ActualTimeSeries the two modes are equivalent. Leaving Null/None/Empty is equivalent to Merge.
+
 
 DerivedCfg can be of algorithm type: Coalesce, Sum, Muv.
 
@@ -829,6 +840,37 @@ mkservice.upsertData(data)
 
 ```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for VersionedTimeSeries the merge writes in to the curve replacing existing data for an existing instant, replace writes the payload removing any previous data for the version. Leaving Null/None/Empty is equivalent to Merge.
+
+| DATETIME | EXISTING | PAYLOAD | MERGE | REPALACE |
+|---|---|---|---|---|
+| VERSION NAME | 2025-01-01 | 2025-01-01 | 2025-01-01 | 2025-01-01 |
+| 2025-01-01 |        |        |        |        |
+| 2025-01-02 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-03 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-04 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-05 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-06 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-07 | 999.99 | 222.22 | 222.22 | 222.22 |
+| 2025-01-08 |        | 222.22 | 222.22 | 222.22 |
+| 2025-01-09 |        |        |        |        |
+| 2025-01-10 |        |        |        |        |
+| 2025-01-11 | 999.99 |        | 999.99 |        |
+| 2025-01-12 | 999.99 |        | 999.99 |        |
+| 2025-01-13 | 999.99 |        | 999.99 |        |
+| 2025-01-14 |        |        |        |        |
+| 2025-01-15 |        |        |        |        |
+
+
 ### Write Data in a Market Assessment Time Series
 
 ```Python
@@ -876,6 +918,18 @@ mkservice.upsertData(marketAssessment)
 
 ```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for MarketAssessment merge adds the new products to the existing and overwrites existing with the new ones while replace replaces all the existing products with the new ones. Leaving Null/None/Empty is equivalent to Merge.
+
+
 ### Write Data in a Bid Ask Time Series
 
 ```Python
@@ -922,6 +976,18 @@ bidAsk = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER', 'MARK
 mkservice.upsertData(bidAsk)
 ```
 
+Upsert has optional switches that can be applied
+```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for BidAsk merge adds the new products to the existing and overwrites existing with the new ones while replace replaces all the existing products with the new ones. Leaving Null/None/Empty is equivalent to Merge.
+
+
 ### Write Data in an Auction Time Series
 
 ```Python
@@ -966,8 +1032,19 @@ auctionRows = MarketData.UpsertData(MarketData.MarketDataIdentifier('PROVIDER',
 
   mkservice.upsertData(auctionRows)
 
+```
 
+Upsert has optional switches that can be applied
 ```
+mkservice.upsertData(data, deferCommandExecution, deferDataGeneration, keepNulls, upsertMode)
+```
+The switch details are,
+
+deferCommandExecution (true/false) choose between syncronoys and asyncronous command execution, default is false.
+deferDataGeneration (true/false) choose between syncronoys and asyncronous precomputed data generation, default is true.
+keepNulls (true/false) if true then nulls are written in the curve replacing any data present for the instant, default is false.
+upsertMode (Merge/Replace) for Auction merge and replace are equivalent. Leaving Null/None/Empty is equivalent to Merge.
+
 
 ## Delete Data in Artesian
 

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/samples/TestWriteDataAndDeleteActual.py

@@ -3,31 +3,35 @@ import Artesian
 from Artesian import Query
 from Artesian.Granularity import Granularity
 from Artesian.MarketData._Enum.MarketDataType import MarketDataType
+from Artesian.MarketData._Enum.UpsertMode import UpsertMode
 
 cfg = Artesian.ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey")
 mkdservice = Artesian.MarketData.MarketDataService(cfg)
 
-actual = Artesian.MarketData.MarketDataEntityInput(
+mktId = Artesian.MarketData.MarketDataIdentifier(
     "PythonSDK",
-    "TestActualWriteAndDelete",
+    "TestActualWriteAndDelete"
+)
+
+mktDataEntity = Artesian.MarketData.MarketDataEntityInput(
+    mktId.provider,
+    mktId.name,
     Granularity.Hour,
     MarketDataType.ActualTimeSerie,
     "CET",
     tags={"TestSDKPython": ["PythonValue2"]},
 )
 
-registered = mkdservice.readMarketDataRegistryByName(
-    actual.providerName, actual.marketDataName
-)
+registered = mkdservice.readMarketDataRegistryByName(mktId.provider, mktId.name)
+
 if registered is None:
-    registered = mkdservice.registerMarketData(actual)
+    registered = mkdservice.registerMarketData(mktDataEntity)
 
 data = Artesian.MarketData.UpsertData(
-    Artesian.MarketData.MarketDataIdentifier(
-        actual.providerName, actual.marketDataName
-    ),
+    mktId,
     "UTC",
     rows={datetime(2020, 1, 1, h): 42.0 + h / 24.0 for h in range(0, 23)},
+    upsertMode=UpsertMode.Merge
 )
 
 mkdservice.upsertData(data)
@@ -47,9 +51,7 @@ print(res)
 
 # 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
-    ),
+    mktId,
     timezone="CET",
     rangeStart=datetime(2020, 1, 1, 6),
     rangeEnd=datetime(2020, 1, 1, 18),
@@ -71,9 +73,7 @@ print(res)
 
 # 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
-    ),
+    mktId,
     rangeStart=datetime(2020, 1, 1, 6),
     rangeEnd=datetime(2020, 1, 1, 18),
 )

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/samples/TestWriteDataAndDeleteAuction.py

@@ -4,13 +4,19 @@ from Artesian import Query
 from dateutil import tz
 from Artesian import MarketData
 from Artesian.Granularity import Granularity
+from Artesian.MarketData._Enum.UpsertMode import UpsertMode
 
 cfg = Artesian.ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey")
 mkdservice = Artesian.MarketData.MarketDataService(cfg)
 
-auction = Artesian.MarketData.MarketDataEntityInput(
+mktId = Artesian.MarketData.MarketDataIdentifier(
     "PythonSDK",
-    "TestAuctionWriteAndDelete",
+    "TestAuctionWriteAndDelete"
+)
+
+mktDataEntity = Artesian.MarketData.MarketDataEntityInput(
+    mktId.provider,
+    mktId.name,
     Granularity.Hour,
     MarketData.MarketDataType.Auction,
     "CET",
@@ -18,10 +24,10 @@ auction = Artesian.MarketData.MarketDataEntityInput(
 )
 
 registered = mkdservice.readMarketDataRegistryByName(
-    auction.providerName, auction.marketDataName
+    mktId.provider, mktId.name
 )
 if registered is None:
-    registered = mkdservice.registerMarketData(auction)
+    registered = mkdservice.registerMarketData(mktDataEntity)
 
 auctionRowData = {
     datetime(2020, 1, 1, h): MarketData.AuctionBids(
@@ -39,12 +45,11 @@ auctionRowData = {
 }
 
 auctionRows = MarketData.UpsertData(
-    Artesian.MarketData.MarketDataIdentifier(
-        auction.providerName, auction.marketDataName
-    ),
+    mktId,
     "UTC",
     auctionRows=auctionRowData,
     downloadedAt=datetime(2020, 1, 3).replace(tzinfo=tz.UTC),
+    upsertMode=UpsertMode.Merge
 )
 
 mkdservice.upsertData(auctionRows)
@@ -63,9 +68,7 @@ print(res)
 
 # 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
-    ),
+    ID=mktId,
     timezone="CET",
     rangeStart=datetime(2020, 1, 1, 6),
     rangeEnd=datetime(2020, 1, 1, 18),
@@ -85,9 +88,7 @@ print(res)
 
 # 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
-    ),
+    ID=mktId,
     rangeStart=datetime(2020, 1, 1, 6),
     rangeEnd=datetime(2020, 1, 1, 18),
 )

{artesian_sdk-4.2.1.dev2 → artesian_sdk-4.2.2}/samples/TestWriteDataAndDeleteVersioned.py

@@ -3,6 +3,7 @@ import Artesian
 from Artesian import Query
 from Artesian.Granularity import Granularity
 from Artesian.MarketData._Enum.MarketDataType import MarketDataType
+from Artesian.MarketData._Enum.UpsertMode import UpsertMode
 
 cfg = Artesian.ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey")
 mkdservice = Artesian.MarketData.MarketDataService(cfg)
@@ -12,7 +13,7 @@ versioned = Artesian.MarketData.MarketDataEntityInput(
     "TestVersionedWriteAndDelete",
     Granularity.Hour,
     MarketDataType.VersionedTimeSerie,
-    "CET",
+    "UTC",
     tags={"TestSDKPython": ["PythonValue2"]},
 )
 
@@ -31,7 +32,33 @@ data = Artesian.MarketData.UpsertData(
     marketIdentifier,
     "UTC",
     version=testVersion,
-    rows={datetime(2020, 1, 1, h): 42.0 + h / 24.0 for h in range(0, 23)},
+    rows={
+        datetime(2020, 1, 1, 0): 11.0,
+        datetime(2020, 1, 1, 1): 22.0,
+        datetime(2020, 1, 1, 2): 33.0,
+        datetime(2020, 1, 1, 3): 44.0,
+        datetime(2020, 1, 1, 4): 55.0,
+        datetime(2020, 1, 1, 5): 66.0,
+        datetime(2020, 1, 1, 6): 77.0,
+        datetime(2020, 1, 1, 7): 88.0,
+        datetime(2020, 1, 1, 8): 99.0,
+        datetime(2020, 1, 1, 9): 100.1,
+        datetime(2020, 1, 1, 10): 111.1,
+        datetime(2020, 1, 1, 11): 122.1,
+        datetime(2020, 1, 1, 12): 133.1,
+        datetime(2020, 1, 1, 13): 144.1,
+        datetime(2020, 1, 1, 14): 155.1,
+        datetime(2020, 1, 1, 15): 166.1,
+        datetime(2020, 1, 1, 16): 177.1,
+        datetime(2020, 1, 1, 17): 188.1,
+        datetime(2020, 1, 1, 18): 199.1,
+        datetime(2020, 1, 1, 19): 200.2,
+        datetime(2020, 1, 1, 20): 211.2,
+        datetime(2020, 1, 1, 21): 222.2,
+        datetime(2020, 1, 1, 22): 233.2,
+        datetime(2020, 1, 1, 23): 244.2
+    },
+    upsertMode=UpsertMode.Merge
 )
 
 mkdservice.upsertData(data)
@@ -42,7 +69,7 @@ res = (
     query.createVersioned()
     .forMarketData([registered.marketDataId])
     .inAbsoluteDateRange("2020-01-01", "2020-01-02")
-    .inTimeZone("CET")
+    .inTimeZone("UTC")
     .inGranularity(Granularity.Hour)
     # .forMUV()
     # .forLastNVersions(2)
@@ -57,7 +84,7 @@ deleteData = Artesian.MarketData.DeleteData(
     ID=Artesian.MarketData.MarketDataIdentifier(
         registered.providerName, registered.marketDataName
     ),
-    timezone="CET",
+    timezone="UTC",
     rangeStart=datetime(2020, 1, 1, 6),
     rangeEnd=datetime(2020, 1, 1, 18),
     version=testVersion,
@@ -69,7 +96,7 @@ res = (
     query.createVersioned()
     .forMarketData([registered.marketDataId])
     .inAbsoluteDateRange("2020-01-01", "2020-01-02")
-    .inTimeZone("CET")
+    .inTimeZone("UTC")
     .inGranularity(Granularity.Hour)
     .forVersion("2020-01-01T12:00:00")
     .execute()
@@ -101,5 +128,53 @@ res = (
 
 print(res)
 
+data = Artesian.MarketData.UpsertData(
+    marketIdentifier,
+    "UTC",
+    version=testVersion,
+    rows={
+        datetime(2020, 1, 1, 3): 944.0,
+        datetime(2020, 1, 1, 4): 955.0,
+        datetime(2020, 1, 1, 5): 966.0,
+        datetime(2020, 1, 1, 6): 977.0,
+        datetime(2020, 1, 1, 7): 988.0,
+        datetime(2020, 1, 1, 8): 999.0,
+        datetime(2020, 1, 1, 9): 9100.1,
+        datetime(2020, 1, 1, 10): 9111.1,
+        datetime(2020, 1, 1, 11): 9122.1,
+        datetime(2020, 1, 1, 12): 9133.1,
+        datetime(2020, 1, 1, 13): 9144.1,
+        datetime(2020, 1, 1, 14): 9155.1,
+        datetime(2020, 1, 1, 15): 9166.1,
+        datetime(2020, 1, 1, 16): 9177.1,
+        datetime(2020, 1, 1, 17): 9188.1,
+        datetime(2020, 1, 1, 18): 9199.1,
+        datetime(2020, 1, 1, 19): 9200.2,
+        datetime(2020, 1, 1, 20): 9211.2,
+        datetime(2020, 1, 1, 21): 9222.2,
+        datetime(2020, 1, 1, 22): 9233.2,
+        datetime(2020, 1, 1, 23): 9244.2
+    },
+    upsertMode=UpsertMode.Replace
+)
+
+mkdservice.upsertData(data)
+
+query = Query.QueryService(cfg)
+
+res = (
+    query.createVersioned()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .inTimeZone("UTC")
+    .inGranularity(Granularity.Hour)
+    # .forMUV()
+    # .forLastNVersions(2)
+    .forVersion("2020-01-01T12:00:00")
+    .execute()
+)
+
+print(res)
+
 # Delete the curve completely
 mkdservice.deleteMarketData(registered.marketDataId)

artesian_sdk-4.2.2/samples/TestWriteDataAndQueryBidAsk.py

@@ -0,0 +1,91 @@
+from datetime import datetime
+import Artesian
+from Artesian import Query
+from dateutil import tz
+from Artesian import MarketData
+from Artesian.Granularity import Granularity
+from Artesian.MarketData._Enum.UpsertMode import UpsertMode
+
+cfg = Artesian.ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey")
+mkdservice = Artesian.MarketData.MarketDataService(cfg)
+
+mktId = Artesian.MarketData.MarketDataIdentifier("PythonSDK", "TestBidAskWriteAndRead")
+
+registered = mkdservice.readMarketDataRegistryByName(mktId.provider, mktId.name)
+
+mktDataInput = Artesian.MarketData.MarketDataEntityInput(
+    mktId.provider,
+    mktId.name,
+    Granularity.Hour,
+    MarketData.MarketDataType.BidAsk,
+    "CET",
+    tags={"TestSDKPython": ["PythonValue2"]}
+)
+
+if registered is None:
+    registered = mkdservice.registerMarketData(mktDataInput)
+
+bidAsk = MarketData.UpsertData(
+    mktId,
+    "UTC",
+    bidAsk={
+        datetime(2020, 1, 1, 3): {
+            "Feb-20": MarketData.BidAskValue(bestBidPrice=15.5, bestAskQuantity=20.3, lastPrice=16.7, lastQuantity=14.1),
+            "Mar-20": MarketData.BidAskValue(bestBidPrice=25.5, bestAskQuantity=30.4, lastPrice=26.4, lastQuantity=24.3),
+        },
+        datetime(2020, 1, 1, 6): {
+            "Feb-20": MarketData.BidAskValue(bestBidPrice=15.7, bestAskQuantity=20.2, lastPrice=16.6, lastQuantity=14.7),
+            "Mar-20": MarketData.BidAskValue(bestBidPrice=25.4, bestAskQuantity=30.3, lastPrice=26.8, lastQuantity=24.9),
+        },
+    },
+    downloadedAt=datetime(2020, 1, 3).replace(tzinfo=tz.UTC),
+    upsertMode=UpsertMode.Merge
+)
+
+mkdservice.upsertData(bidAsk)
+
+query = Query.QueryService(cfg)
+
+res = (
+    query.createBidAsk()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .forProducts(["Feb-20", "Mar-20"])
+    .inTimeZone("CET")
+    .execute()
+)
+
+print(res)
+
+bidAsk2 = MarketData.UpsertData(
+    mktId,
+    "UTC",
+    bidAsk={
+        datetime(2020, 1, 1, 6): {
+            "Mar-20": MarketData.BidAskValue(bestBidPrice=25.2, bestAskQuantity=20.8, lastPrice=16.4, lastQuantity=24.3),
+        },
+        datetime(2020, 1, 1, 12): {
+            "Mar-20": MarketData.BidAskValue(bestBidPrice=25.1, bestAskQuantity=20.5, lastPrice=16.8, lastQuantity=24.7),
+        },
+    },
+    downloadedAt=datetime(2020, 1, 3).replace(tzinfo=tz.UTC),
+    upsertMode=UpsertMode.Replace
+)
+
+mkdservice.upsertData(bidAsk2)
+
+query2 = Query.QueryService(cfg)
+
+res2 = (
+    query2.createBidAsk()
+    .forMarketData([registered.marketDataId])
+    .inAbsoluteDateRange("2020-01-01", "2020-01-02")
+    .forProducts(["Feb-20", "Mar-20"])
+    .inTimeZone("CET")
+    .execute()
+)
+
+print(res2)
+
+# Delete the curve completely
+mkdservice.deleteMarketData(registered.marketDataId)