-
Notifications
You must be signed in to change notification settings - Fork 1
Transform derived integration and derived validation #61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
ec61074
feat(transformderivedandtest): transform derived integration and deri…
jacopocinaark 6034740
fix
jacopocinaark 26a1ba5
fix changes table_name in $table
jacopocinaark a3c5c41
test on derived transform curve
jacopocinaark 5a5564c
Potential fix for pull request finding 'Module is imported with 'impo…
jacopocinaark 56a3ae8
added tests and readme missing
jacopocinaark b6b1bb9
Merge branch '21929-TransformDerivedAndQueryTest' of https://github.c…
jacopocinaark f3f6e58
Potential fix for pull request finding 'Unused import'
jacopocinaark 193b705
fix pyright
jacopocinaark 1e20f40
Merge branch '21929-TransformDerivedAndQueryTest' of https://github.c…
jacopocinaark 99360f5
renamed Pyright
jacopocinaark 02549f4
pyright name
jacopocinaark ab65fde
Run Pyright
jacopocinaark 15aa8e8
yaml
jacopocinaark 7129348
test
jacopocinaark 4dd76a8
restored yaml
jacopocinaark a666864
Apply suggestions from code review
jacopocinaark d20a9a3
Apply suggestions from code review
jacopocinaark e9eb0f1
Potential fix for pull request finding
jacopocinaark 58a0346
changed test file name
jacopocinaark 58d38a3
Merge branch '21929-TransformDerivedAndQueryTest' of https://github.c…
jacopocinaark b5e0f60
fix DerivedTransformQueryValidation
jacopocinaark df50e1b
fix
jacopocinaark fa66e6d
Merge branch 'master' into 21929-TransformDerivedAndQueryTest
jacopocinaark 80f158d
Potential fix for pull request finding
jacopocinaark a164a3e
Potential fix for pull request finding
jacopocinaark 0714424
fix
jacopocinaark e3fc2b0
flake8 blank line fix
jacopocinaark 9fb4215
Merge branch 'master' into 21929-TransformDerivedAndQueryTest
jacopocinaark File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
arkcecchi marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| from datetime import datetime | ||
| import Artesian | ||
|
github-code-quality[bot] marked this conversation as resolved.
Fixed
|
||
| from Artesian.Granularity import Granularity | ||
| from Artesian.MarketData._Dto.DerivedCfg import DerivedCfg | ||
| from Artesian.MarketData._Enum.DerivedAlgorithm import DerivedAlgorithm | ||
| from Artesian.MarketData._Enum.MarketDataType import MarketDataType | ||
| import time | ||
|
|
||
| cfg = Artesian.ArtesianConfig("https://arkive.artesian.cloud/tenantName/", "APIKey") | ||
|
|
||
| mkdservice = Artesian.MarketData.MarketDataService(cfg) | ||
|
|
||
| # curveOne | ||
| actualCurveOne = Artesian.MarketData.MarketDataEntityInput( | ||
| "TestProviderNameDerivedTransform", | ||
| "CurveOne", | ||
| Granularity.Hour, | ||
| MarketDataType.ActualTimeSerie, | ||
| "UTC" | ||
| ) | ||
|
|
||
| registeredCurveOne = mkdservice.readMarketDataRegistryByName( | ||
| actualCurveOne.providerName, actualCurveOne.marketDataName | ||
| ) | ||
| if registeredCurveOne is None: | ||
| registeredCurveOne = mkdservice.registerMarketData(actualCurveOne) | ||
|
|
||
| marketIdentifierCurveOne = Artesian.MarketData.MarketDataIdentifier( | ||
| actualCurveOne.providerName, actualCurveOne.marketDataName | ||
| ) | ||
|
|
||
| # mkdservice.deleteMarketData(registeredCurveOne.marketDataId) | ||
|
|
||
| data = Artesian.MarketData.UpsertData( | ||
| marketIdentifierCurveOne, | ||
| "UTC", | ||
| rows={datetime(2020, 1, 1, h): 10 for h in range(0, 8)}, | ||
| ) | ||
|
|
||
| mkdservice.upsertData(data) | ||
|
|
||
| curveIds = [registeredCurveOne.marketDataId] | ||
|
|
||
| # Create DerivedCfgTransform | ||
| derivedCfg = DerivedCfg( | ||
| version=1, | ||
| derivedAlgorithm=DerivedAlgorithm.Transform, | ||
| transform="SELECT Time, (Value + 1) as Value FROM $table", | ||
| orderedReferencedMarketDataIds=curveIds, | ||
| ) | ||
|
|
||
| actualCurveDerived = Artesian.MarketData.MarketDataEntityInput( | ||
| "TestProviderNameDerivedTransform", | ||
| "CurveDerived", | ||
| Granularity.Hour, | ||
| MarketDataType.ActualTimeSerie, | ||
| "UTC", | ||
| derivedCfg=derivedCfg, | ||
| ) | ||
|
|
||
| registeredDerived = mkdservice.readMarketDataRegistryByName( | ||
| actualCurveDerived.providerName, actualCurveDerived.marketDataName | ||
| ) | ||
|
|
||
| # mkdservice.deleteMarketData(registeredDerived.marketDataId) | ||
|
|
||
| if registeredDerived is None: | ||
| registeredDerived = mkdservice.registerMarketData(actualCurveDerived) | ||
|
|
||
| # check that derivedCfg is as expected | ||
| assert ( | ||
| registeredDerived.derivedCfg is not None | ||
| and registeredDerived.derivedCfg.derivedAlgorithm == DerivedAlgorithm.Transform | ||
| ), "Derived Algorithm is not the expected (Transform)" | ||
|
|
||
| marketIdentifierDerived = Artesian.MarketData.MarketDataIdentifier( | ||
| actualCurveDerived.providerName, actualCurveDerived.marketDataName | ||
| ) | ||
|
|
||
| time.sleep(2) | ||
|
|
||
| # get the derived curve and check values are in according to the configuration | ||
| query = Artesian.Query.QueryService(cfg) | ||
|
|
||
| res = ( | ||
| query.createActual() | ||
| .forMarketData([registeredDerived.marketDataId]) | ||
| .inAbsoluteDateRange("2020-01-01", "2020-01-02") | ||
| .inTimeZone("UTC") | ||
| .inGranularity(Granularity.Hour) | ||
| .execute() | ||
| ) | ||
|
|
||
| print(res) | ||
|
|
||
| for i in range(0, 8): | ||
| assert res[i]['D'] == 11 | ||
|
|
||
| # Delete the curves completely | ||
| mkdservice.deleteMarketData(registeredCurveOne.marketDataId) | ||
| mkdservice.deleteMarketData(registeredDerived.marketDataId) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.