diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 0b6d10ea..a6dd8e04 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - name: Get version run: | - echo "VERSION=$(cat austrakka/__init__.py | grep __version__ | cut -d "=" -f2 | cut -d "\"" -f2)" >> $GITHUB_ENV + echo "VERSION=$(cat trakka/__init__.py | grep __version__ | cut -d "=" -f2 | cut -d "\"" -f2)" >> $GITHUB_ENV - name: Bump version and push tag id: tag_version uses: mathieudutour/github-tag-action@v5.6 diff --git a/.github/workflows/check_version.yml b/.github/workflows/check_version.yml index 249afbfc..b1bbc542 100644 --- a/.github/workflows/check_version.yml +++ b/.github/workflows/check_version.yml @@ -23,8 +23,8 @@ jobs: path: master - name: Get versions run: | - echo "MASTER_VERSION=$(cat master/austrakka/__init__.py | grep __version__ | cut -d "=" -f2 | cut -d "\"" -f2)" >> $GITHUB_ENV - echo "PR_VERSION=$(cat pr/austrakka/__init__.py | grep __version__ | cut -d "=" -f2 | cut -d "\"" -f2)" >> $GITHUB_ENV + echo "MASTER_VERSION=$(cat master/trakka/__init__.py | grep __version__ | cut -d "=" -f2 | cut -d "\"" -f2)" >> $GITHUB_ENV + echo "PR_VERSION=$(cat pr/trakka/__init__.py | grep __version__ | cut -d "=" -f2 | cut -d "\"" -f2)" >> $GITHUB_ENV - name: Compare Versions id: compare_versions uses: samcarswell/semver-compare-action@0.1 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 34a0b687..498c2a32 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -17,4 +17,4 @@ jobs: pip install -r requirements.txt - name: Analysing the code with pylint run: | - pylint austrakka test + pylint trakka test diff --git a/CHANGELOG.md b/CHANGELOG.md index fb43aca6..cbf8a6bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,7 +50,7 @@ and this project adheres to [Semantic Versioning]. ### Changed - `user add` now requires `--username`. -- `--queue-name` has been renamed to `--queue` for `austrakka admin message dl [show|list|delete|resend]`. +- `--queue-name` has been renamed to `--queue` for `trakka admin message dl [show|list|delete|resend]`. ## [0.81.0] - 2026-03-11 @@ -146,7 +146,7 @@ over 256 allowed values. - `iam privilege list-by-user` now accepts `-gid, --global-id` rather than a positonal argument. - `org privilege list-by-role` now accepts `-gid, --global-id` rather than a positonal argument. - `org privilege list-by-user` now accepts `-gid, --global-id` rather than a positonal argument. -- Updated the `austrakka proforma list` command to accept the `-vt`/`--view-type` option, which determines the verbosity of the output. +- Updated the `trakka proforma list` command to accept the `-vt`/`--view-type` option, which determines the verbosity of the output. Possible values for `-vt` are: - `compact`: Displays minimal columns. - `more`: Displays additional columns. @@ -265,7 +265,7 @@ if the `--create` flag is set. ### Changed - Updated the `project update` command to accept the project type parameter `-t`/`--type`. -- Updated the `austrakka project list` command to accept the `-vt`/`--view-type` option, which determines the verbosity of the output. +- Updated the `trakka project list` command to accept the `-vt`/`--view-type` option, which determines the verbosity of the output. Possible values for `-vt` are: - `compact`: Displays minimal columns. - `more`: Displays additional columns. @@ -294,7 +294,7 @@ is not required. ## [0.65.0] ### Changed - Project dashboard commands now take a project abbreviation as an argument, rather than a project ID. -This update corresponds to a change in the AusTrakka API. +This update corresponds to a change in the Trakka API. - Removed unused commands and parameters concerning dashboard widgets. The `project get-dashboard` command now shows the currently-assigned dashboard for a project. @@ -386,8 +386,8 @@ These changes involve backwards-incompatible changes to syntax. Sequence data ty - fasta-asm - FASTA assembly, may be multi-contig - fasta-cns - single-contig consensus FASTA sequence (previously called fasta) - The `seq add` command has been updated to support more types of sequence data. - The syntax for uploading single-contig consensus sequences is now `austrakka seq add fasta-cns seqs.fasta`. - The syntax for uploading other types of sequence data is now `austrakka seq add files.csv`. + The syntax for uploading single-contig consensus sequences is now `trakka seq add fasta-cns seqs.fasta`. + The syntax for uploading other types of sequence data is now `trakka seq add files.csv`. - The `seq sync get` and `seq get` commands have been updated to support more types of sequence data. It is now possible to sync multiple types of sequence data from the same group or project to the same output directory. Sequences will now be downloaded to a subdirectory specific to the sequence type, i.e. // . @@ -518,7 +518,7 @@ In the case of fasta-cns data, the aggregated sequence file, previously named al - `sample groups` command. ### Changed -- `user add` and `user update` to handle AusTrakka process accounts. +- `user add` and `user update` to handle Trakka process accounts. ## [0.35.1] - 2023-09-18 ### Changed @@ -528,7 +528,7 @@ In the case of fasta-cns data, the aggregated sequence file, previously named al ### Changed - `seq add` commands will now provide a summary at the end of a bulk upload, including the number of sequences uploaded, and which sequences failed upload. - Sequence list and download commands no longer take the deprecated --sub-query-type flag. -A CLI update to this version will be required to support download from the updated AusTrakka server. +A CLI update to this version will be required to support download from the updated Trakka server. ### Fixed - `proforma attach` command options --file-path and --n-previous are now correctly mutually exclusive @@ -649,7 +649,7 @@ A CLI update to this version will be required to support download from the updat ## [0.25.0] - 2023-03-02 ### Added -- Added `proforma listgroups` command to show ProFormaEditors and AusTrakkaAdmins what group has access to a given pro forma. +- Added `proforma listgroups` command to show ProFormaEditors and TrakkaAdmins what group has access to a given pro forma. ## [0.24.1] - 2023-02-23 ### Changed diff --git a/CLAUDE.md b/CLAUDE.md deleted file mode 100644 index d3d8e711..00000000 --- a/CLAUDE.md +++ /dev/null @@ -1,86 +0,0 @@ -# Software Development Practices - -## Structure -### Click commands -1. All public facing Click commands are placed in __init__.py and are declared with options and parameters. -2. Command declarations don't do any work. Instead, they immediately call methods in the sibling funcs.py file. -3. The naming of command declaration functions are reversed in the top-level function in funcs.py. For example - the command function might be declared as proforma_add(), and it would call add_proforma() in func.py to do - the work. -4. Commands are organised under "/austrakka/components//__init__.py", and also func.py - in the same directory. There may also be sub commands under each component directory. - -### Tests -1. We favour writing end-to-end tests with no mocks. You can expect the environment to be set up for you - to simply run these test. -2. All tests for each Click command are placed in the same file. One file per command. -3. Naming convention for the test file is "test__commands.py". -4. All end-to-end tests are placed in the "/test/end_to_end_tests" folder. -5. Look at "/test/end_to_end_tests/test_seq_add_commands.py" as the example for how tests are written. -6. Expect utilities to be available in ete_utils.py for creating data and invoking commands. -7. Tests are run using pytest. -8. One test should be written for each use case. That means one test per major assert (the point of the test). - There can be other asserts of minor property values, those are fine, but do not test many error conditions - that represent distinct use case, all in the one test. - -### Running Tests -To run tests in this project, follow these steps: - - 1. Ensure the following environment variables are set with your credentials: - * AT_AUTH_TENANT_ID - * AT_AUTH_APP_URI - * AT_AUTH_PROCESS_ID - * AT_AUTH_PROCESS_SECRET - - This can be achieved by running 'austrakka auth process' once, which will populate these variables - in your shell's current environment. Once you've done this the first time, then you must run it a - second time with 'export AT_TOKEN=$(austrakka auth process)' to populate the token before pytest - can run. - - 2. Execute the tests using the following command, which handles authentication and runs pytest for a specific test suite: - pipenv run bash -c 'export AT_TOKEN=$(austrakka auth process) && pytest ' - - or run all tests with: - pipenv run bash -c 'export AT_TOKEN=$(austrakka auth process) && pytest' - -### Linting -1. Linting is performed by running "pylint austrakka". -2. Always run the linter and fix any issues identified before commiting the code. - -## Coding style -1. All private functions start with '_' and are positioned towards the bottom of the file. -2. Rather than specify Click options using raw constructs, custom options are normally created for reuse. For - example, instead of annotating a function with: - - click.option( - '-f', - '--format', - 'out_format', - default=default, - type=click.Choice(valid_formats), - help='Formatting option', - show_default=True, - ) - - We instead wrap it up in a function and place it in the /austrakka/utils/options.py file. - Here's an example for a different option. - - def opt_group_name(var_name='group_name', **attrs: t.Any): - defaults = { - 'required': True, - 'help': 'Group Name', - } - return create_option( - "-g", - "--group-name", - var_name, - type=click.STRING, - **{**defaults, **attrs} - ) - - and then use it like this: - - @opt_group_name(var_name='group_names', multiple=True) - def proforma_share(proforma_abbrev: str, group_names: List[str]): - pass - diff --git a/Pipfile b/Pipfile index ca0475e5..e6996ab4 100644 --- a/Pipfile +++ b/Pipfile @@ -10,10 +10,10 @@ pycodestyle = "==2.14.0" pytest = "==9.0.2" vistir = "==0.8.0" pytest-azurepipelines = "==1.0.5" -cx-freeze = "==8.5.3" +cx-freeze = "==8.6.4" [packages] -austrakka = {editable = true, path = "."} +trakka = {editable = true, path = "."} azure-identity = "==1.25.1" click = "==8.3.1" loguru = "==0.7.3" diff --git a/Pipfile.lock b/Pipfile.lock index 81bc62d4..474aec9c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "c9366927b691b4dc3695c3956b3ac7e09ed51d845e9f7d3a2e578d7c6b2d85c0" + "sha256": "9279b94a63f2d08abe39434119ce4f4de80b38633f212d26ef85f201b33ff43f" }, "pipfile-spec": 6, "requires": { @@ -18,24 +18,19 @@ "default": { "anyio": { "hashes": [ - "sha256:41cfcc3a4c85d3f05c932da7c26d0201ac36f72abd4435ba90d0464a3ffed703", - "sha256:d405828884fc140aa80a3c667b8beed277f1dfedec42ba031bd6ac3db606ab6c" + "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", + "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc" ], - "markers": "python_version >= '3.9'", - "version": "==4.12.1" - }, - "austrakka": { - "editable": true, - "markers": "python_version >= '3.9' and python_version < '4'", - "path": "." + "markers": "python_version >= '3.10'", + "version": "==4.13.0" }, "azure-core": { "hashes": [ - "sha256:074806c75cf239ea284a33a66827695ef7aeddac0b4e19dda266a93e4665ead9", - "sha256:67562857cb979217e48dc60980243b61ea115b77326fa93d83b729e7ff0482e7" + "sha256:4ac7b70fab5438c3f68770649a78daf97833caa83827f91df9c14e0e0ea7d34f", + "sha256:8a90a562998dd44ce84597590fff6249701b98c0e8797c95fcdd695b54c35d74" ], "markers": "python_version >= '3.9'", - "version": "==1.38.2" + "version": "==1.39.0" }, "azure-identity": { "hashes": [ @@ -102,11 +97,11 @@ }, "certifi": { "hashes": [ - "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c", - "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120" + "sha256:027692e4402ad994f1c42e52a4997a9763c646b73e4096e4d5d6db8af1d6f0fa", + "sha256:e887ab5cee78ea814d3472169153c2d12cd43b14bd03329a39a9c6e2e80bfba7" ], "markers": "python_version >= '3.7'", - "version": "==2026.1.4" + "version": "==2026.2.25" }, "cffi": { "hashes": [ @@ -200,122 +195,138 @@ }, "charset-normalizer": { "hashes": [ - "sha256:027f6de494925c0ab2a55eab46ae5129951638a49a34d87f4c3eda90f696b4ad", - "sha256:077fbb858e903c73f6c9db43374fd213b0b6a778106bc7032446a8e8b5b38b93", - "sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394", - "sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89", - "sha256:0f04b14ffe5fdc8c4933862d8306109a2c51e0704acfa35d51598eb45a1e89fc", - "sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86", - "sha256:194f08cbb32dc406d6e1aea671a68be0823673db2832b38405deba2fb0d88f63", - "sha256:1bee1e43c28aa63cb16e5c14e582580546b08e535299b8b6158a7c9c768a1f3d", - "sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f", - "sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8", - "sha256:244bfb999c71b35de57821b8ea746b24e863398194a4014e4c76adc2bbdfeff0", - "sha256:2677acec1a2f8ef614c6888b5b4ae4060cc184174a938ed4e8ef690e15d3e505", - "sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161", - "sha256:2aaba3b0819274cc41757a1da876f810a3e4d7b6eb25699253a4effef9e8e4af", - "sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152", - "sha256:2c9d3c380143a1fedbff95a312aa798578371eb29da42106a29019368a475318", - "sha256:3162d5d8ce1bb98dd51af660f2121c55d0fa541b46dff7bb9b9f86ea1d87de72", - "sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4", - "sha256:362d61fd13843997c1c446760ef36f240cf81d3ebf74ac62652aebaf7838561e", - "sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3", - "sha256:44c2a8734b333e0578090c4cd6b16f275e07aa6614ca8715e6c038e865e70576", - "sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c", - "sha256:4902828217069c3c5c71094537a8e623f5d097858ac6ca8252f7b4d10b7560f1", - "sha256:4bd5d4137d500351a30687c2d3971758aac9a19208fc110ccb9d7188fbe709e8", - "sha256:4fe7859a4e3e8457458e2ff592f15ccb02f3da787fcd31e0183879c3ad4692a1", - "sha256:542d2cee80be6f80247095cc36c418f7bddd14f4a6de45af91dfad36d817bba2", - "sha256:554af85e960429cf30784dd47447d5125aaa3b99a6f0683589dbd27e2f45da44", - "sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26", - "sha256:5947809c8a2417be3267efc979c47d76a079758166f7d43ef5ae8e9f92751f88", - "sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016", - "sha256:5bd2293095d766545ec1a8f612559f6b40abc0eb18bb2f5d1171872d34036ede", - "sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf", - "sha256:5cb4d72eea50c8868f5288b7f7f33ed276118325c1dfd3957089f6b519e1382a", - "sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc", - "sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0", - "sha256:64b55f9dce520635f018f907ff1b0df1fdc31f2795a922fb49dd14fbcdf48c84", - "sha256:6515f3182dbe4ea06ced2d9e8666d97b46ef4c75e326b79bb624110f122551db", - "sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1", - "sha256:6aee717dcfead04c6eb1ce3bd29ac1e22663cdea57f943c87d1eab9a025438d7", - "sha256:6b39f987ae8ccdf0d2642338faf2abb1862340facc796048b604ef14919e55ed", - "sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8", - "sha256:74018750915ee7ad843a774364e13a3db91682f26142baddf775342c3f5b1133", - "sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e", - "sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef", - "sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14", - "sha256:778d2e08eda00f4256d7f672ca9fef386071c9202f5e4607920b86d7803387f2", - "sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0", - "sha256:798d75d81754988d2565bff1b97ba5a44411867c0cf32b77a7e8f8d84796b10d", - "sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828", - "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", - "sha256:7c308f7e26e4363d79df40ca5b2be1c6ba9f02bdbccfed5abddb7859a6ce72cf", - "sha256:7fa17817dc5625de8a027cb8b26d9fefa3ea28c8253929b8d6649e705d2835b6", - "sha256:81d5eb2a312700f4ecaa977a8235b634ce853200e828fbadf3a9c50bab278328", - "sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090", - "sha256:837c2ce8c5a65a2035be9b3569c684358dfbf109fd3b6969630a87535495ceaa", - "sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381", - "sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c", - "sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb", - "sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc", - "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a", - "sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec", - "sha256:9a26f18905b8dd5d685d6d07b0cdf98a79f3c7a918906af7cc143ea2e164c8bc", - "sha256:9b35f4c90079ff2e2edc5b26c0c77925e5d2d255c42c74fdb70fb49b172726ac", - "sha256:9cd98cdc06614a2f768d2b7286d66805f94c48cde050acdbbb7db2600ab3197e", - "sha256:9d1bb833febdff5c8927f922386db610b49db6e0d4f4ee29601d71e7c2694313", - "sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569", - "sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3", - "sha256:a61900df84c667873b292c3de315a786dd8dac506704dea57bc957bd31e22c7d", - "sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525", - "sha256:a8a8b89589086a25749f471e6a900d3f662d1d3b6e2e59dcecf787b1cc3a1894", - "sha256:a8bf8d0f749c5757af2142fe7903a9df1d2e8aa3841559b2bad34b08d0e2bcf3", - "sha256:a9768c477b9d7bd54bc0c86dbaebdec6f03306675526c9927c0e8a04e8f94af9", - "sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a", - "sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9", - "sha256:b435cba5f4f750aa6c0a0d92c541fb79f69a387c91e61f1795227e4ed9cece14", - "sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25", - "sha256:b5d84d37db046c5ca74ee7bb47dd6cbc13f80665fdde3e8040bdd3fb015ecb50", - "sha256:b7cf1017d601aa35e6bb650b6ad28652c9cd78ee6caff19f3c28d03e1c80acbf", - "sha256:bc7637e2f80d8530ee4a78e878bce464f70087ce73cf7c1caf142416923b98f1", - "sha256:c0463276121fdee9c49b98908b3a89c39be45d86d1dbaa22957e38f6321d4ce3", - "sha256:c4ef880e27901b6cc782f1b95f82da9313c0eb95c3af699103088fa0ac3ce9ac", - "sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e", - "sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815", - "sha256:cb01158d8b88ee68f15949894ccc6712278243d95f344770fa7593fa2d94410c", - "sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6", - "sha256:cc00f04ed596e9dc0da42ed17ac5e596c6ccba999ba6bd92b0e0aef2f170f2d6", - "sha256:cd09d08005f958f370f539f186d10aec3377d55b9eeb0d796025d4886119d76e", - "sha256:cd4b7ca9984e5e7985c12bc60a6f173f3c958eae74f3ef6624bb6b26e2abbae4", - "sha256:ce8a0633f41a967713a59c4139d29110c07e826d131a316b50ce11b1d79b4f84", - "sha256:cead0978fc57397645f12578bfd2d5ea9138ea0fac82b2f63f7f7c6877986a69", - "sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15", - "sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191", - "sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0", - "sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897", - "sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd", - "sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2", - "sha256:e1f185f86a6f3403aa2420e815904c67b2f9ebc443f045edd0de921108345794", - "sha256:e824f1492727fa856dd6eda4f7cee25f8518a12f3c4a56a74e8095695089cf6d", - "sha256:e912091979546adf63357d7e2ccff9b44f026c075aeaf25a52d0e95ad2281074", - "sha256:eaabd426fe94daf8fd157c32e571c85cb12e66692f15516a83a03264b08d06c3", - "sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224", - "sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838", - "sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a", - "sha256:f155a433c2ec037d4e8df17d18922c3a0d9b3232a396690f17175d2946f0218d", - "sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d", - "sha256:f34be2938726fc13801220747472850852fe6b1ea75869a048d6f896838c896f", - "sha256:f820802628d2694cb7e56db99213f930856014862f3fd943d290ea8438d07ca8", - "sha256:f8bf04158c6b607d747e93949aa60618b61312fe647a6369f88ce2ff16043490", - "sha256:f8e160feb2aed042cd657a72acc0b481212ed28b1b9a95c0cee1621b524e1966", - "sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9", - "sha256:fa09f53c465e532f4d3db095e0c55b615f010ad81803d383195b6b5ca6cbf5f3", - "sha256:faa3a41b2b66b6e50f84ae4a68c64fcd0c44355741c6374813a800cd6695db9e", - "sha256:fd44c878ea55ba351104cb93cc85e74916eb8fa440ca7903e57575e97394f608" + "sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc", + "sha256:03853ed82eeebbce3c2abfdbc98c96dc205f32a79627688ac9a27370ea61a49c", + "sha256:07d9e39b01743c3717745f4c530a6349eadbfa043c7577eef86c502c15df2c67", + "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", + "sha256:0c96c3b819b5c3e9e165495db84d41914d6894d55181d2d108cc1a69bfc9cce0", + "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", + "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", + "sha256:12a6fff75f6bc66711b73a2f0addfc4c8c15a20e805146a02d147a318962c444", + "sha256:12d8baf840cc7889b37c7c770f478adea7adce3dcb3944d02ec87508e2dcf153", + "sha256:14265bfe1f09498b9d8ec91e9ec9fa52775edf90fcbde092b25f4a33d444fea9", + "sha256:16d971e29578a5e97d7117866d15889a4a07befe0e87e703ed63cd90cb348c01", + "sha256:177a0ba5f0211d488e295aaf82707237e331c24788d8d76c96c5a41594723217", + "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", + "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", + "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", + "sha256:1dc8b0ea451d6e69735094606991f32867807881400f808a106ee1d963c46a83", + "sha256:1efde3cae86c8c273f1eb3b287be7d8499420cf2fe7585c41d370d3e790054a5", + "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", + "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", + "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", + "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", + "sha256:2cd4a60d0e2fb04537162c62bbbb4182f53541fe0ede35cdf270a1c1e723cc42", + "sha256:2d6eb928e13016cea4f1f21d1e10c1cebd5a421bc57ddf5b1142ae3f86824fab", + "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", + "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", + "sha256:320ade88cfb846b8cd6b4ddf5ee9e80ee0c1f52401f2456b84ae1ae6a1a5f207", + "sha256:3534e7dcbdcf757da6b85a0bbf5b6868786d5982dd959b065e65481644817a18", + "sha256:36836d6ff945a00b88ba1e4572d721e60b5b8c98c155d465f56ad19d68f23734", + "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", + "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", + "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", + "sha256:3c9a494bc5ec77d43cea229c4f6db1e4d8fe7e1bbffa8b6f0f0032430ff8ab44", + "sha256:3dce51d0f5e7951f8bb4900c257dad282f49190fdbebecd4ba99bcc41fef404d", + "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", + "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", + "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", + "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", + "sha256:4e5163c14bffd570ef2affbfdd77bba66383890797df43dc8b4cc7d6f500bf53", + "sha256:511ef87c8aec0783e08ac18565a16d435372bc1ac25a91e6ac7f5ef2b0bff790", + "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", + "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", + "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", + "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", + "sha256:5b77459df20e08151cd6f8b9ef8ef1f961ef73d85c21a555c7eed5b79410ec10", + "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", + "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", + "sha256:6370e8686f662e6a3941ee48ed4742317cafbe5707e36406e9df792cdb535776", + "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", + "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", + "sha256:66671f93accb62ed07da56613636f3641f1a12c13046ce91ffc923721f23c008", + "sha256:6696b7688f54f5af4462118f0bfa7c1621eeb87154f77fa04b9295ce7a8f2943", + "sha256:6785f414ae0f3c733c437e0f3929197934f526d19dfaa75e18fdb4f94c6fb374", + "sha256:67f6279d125ca0046a7fd386d01b311c6363844deac3e5b069b514ba3e63c246", + "sha256:6c114670c45346afedc0d947faf3c7f701051d2518b943679c8ff88befe14f8e", + "sha256:6e0d51f618228538a3e8f46bd246f87a6cd030565e015803691603f55e12afb5", + "sha256:6ed74185b2db44f41ef35fd1617c5888e59792da9bbc9190d6c7300617182616", + "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", + "sha256:715479b9a2802ecac752a3b0efa2b0b60285cf962ee38414211abdfccc233b41", + "sha256:733784b6d6def852c814bce5f318d25da2ee65dd4839a0718641c696e09a2960", + "sha256:750e02e074872a3fad7f233b47734166440af3cdea0add3e95163110816d6752", + "sha256:752a45dc4a6934060b3b0dab47e04edc3326575f82be64bc4fc293914566503e", + "sha256:7579e913a5339fb8fa133f6bbcfd8e6749696206cf05acdbdca71a1b436d8e72", + "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", + "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", + "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", + "sha256:813c0e0132266c08eb87469a642cb30aaff57c5f426255419572aaeceeaa7bf4", + "sha256:82b271f5137d07749f7bf32f70b17ab6eaabedd297e75dce75081a24f76eb545", + "sha256:84c018e49c3bf790f9c2771c45e9313a08c2c2a6342b162cd650258b57817706", + "sha256:8751d2787c9131302398b11e6c8068053dcb55d5a8964e114b6e196cf16cb366", + "sha256:8778f0c7a52e56f75d12dae53ae320fae900a8b9b4164b981b9c5ce059cd1fcb", + "sha256:87fad7d9ba98c86bcb41b2dc8dbb326619be2562af1f8ff50776a39e55721c5a", + "sha256:8d828b6667a32a728a1ad1d93957cdf37489c57b97ae6c4de2860fa749b8fc1e", + "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", + "sha256:92a0a01ead5e668468e952e4238cccd7c537364eb7d851ab144ab6627dbbe12f", + "sha256:94e1885b270625a9a828c9793b4d52a64445299baa1fea5a173bf1d3dd9a1a5a", + "sha256:a180c5e59792af262bf263b21a3c49353f25945d8d9f70628e73de370d55e1e1", + "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", + "sha256:a5fe03b42827c13cdccd08e6c0247b6a6d4b5e3cdc53fd1749f5896adcdc2356", + "sha256:a6c5863edfbe888d9eff9c8b8087354e27618d9da76425c119293f11712a6319", + "sha256:a89c23ef8d2c6b27fd200a42aa4ac72786e7c60d40efdc76e6011260b6e949c4", + "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", + "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", + "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", + "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", + "sha256:aef65cd602a6d0e0ff6f9930fcb1c8fec60dd2cfcb6facaf4bdb0e5873042db0", + "sha256:af21eb4409a119e365397b2adbaca4c9ccab56543a65d5dbd9f920d6ac29f686", + "sha256:b14b2d9dac08e28bb8046a1a0434b1750eb221c8f5b87a68f4fa11a6f97b5e34", + "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", + "sha256:bb8cc7534f51d9a017b93e3e85b260924f909601c3df002bcdb58ddb4dc41a5c", + "sha256:bc17a677b21b3502a21f66a8cc64f5bfad4df8a0b8434d661666f8ce90ac3af1", + "sha256:bd6c2a1c7573c64738d716488d2cdd3c00e340e4835707d8fdb8dc1a66ef164e", + "sha256:bd9b23791fe793e4968dba0c447e12f78e425c59fc0e3b97f6450f4781f3ee60", + "sha256:c03a41a8784091e67a39648f70c5f97b5b6a37f216896d44d2cdcb82615339a0", + "sha256:c0f081d69a6e58272819b70288d3221a6ee64b98df852631c80f293514d3b274", + "sha256:c35abb8bfff0185efac5878da64c45dafd2b37fb0383add1be155a763c1f083d", + "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", + "sha256:c45e9440fb78f8ddabcf714b68f936737a121355bf59f3907f4e17721b9d1aae", + "sha256:c593052c465475e64bbfe5dbd81680f64a67fdc752c56d7a0ae205dc8aeefe0f", + "sha256:cdd68a1fb318e290a2077696b7eb7a21a49163c455979c639bf5a5dcdc46617d", + "sha256:ce3412fbe1e31eb81ea42f4169ed94861c56e643189e1e75f0041f3fe7020abe", + "sha256:cf1493cd8607bec4d8a7b9b004e699fcf8f9103a9284cc94962cb73d20f9d4a3", + "sha256:cf29836da5119f3c8a8a70667b0ef5fdca3bb12f80fd06487cfa575b3909b393", + "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", + "sha256:d560742f3c0d62afaccf9f41fe485ed69bd7661a241f86a3ef0f0fb8b1a397af", + "sha256:d6038d37043bced98a66e68d3aa2b6a35505dc01328cd65217cefe82f25def44", + "sha256:d61f00a0869d77422d9b2aba989e2d24afa6ffd552af442e0e58de4f35ea6d00", + "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", + "sha256:dca4bbc466a95ba9c0234ef56d7dd9509f63da22274589ebd4ed7f1f4d4c54e3", + "sha256:dd915403e231e6b1809fe9b6d9fc55cf8fb5e02765ac625d9cd623342a7905d7", + "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", + "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", + "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", + "sha256:e17b8d5d6a8c47c85e68ca8379def1303fd360c3e22093a807cd34a71cd082b8", + "sha256:e5f4d355f0a2b1a31bc3edec6795b46324349c9cb25eed068049e4f472fb4259", + "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", + "sha256:e74327fb75de8986940def6e8dee4f127cc9752bee7355bb323cc5b2659b6d46", + "sha256:e80c8378d8f3d83cd3164da1ad2df9e37a666cdde7b1cb2298ed0b558064be30", + "sha256:e8ac484bf18ce6975760921bb6148041faa8fef0547200386ea0b52b5d27bf7b", + "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", + "sha256:ed065083d0898c9d5b4bbec7b026fd755ff7454e6e8b73a67f8c744b13986e24", + "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", + "sha256:effc3f449787117233702311a1b7d8f59cba9ced946ba727bdc329ec69028e24", + "sha256:f22dec1690b584cea26fade98b2435c132c1b5f68e39f5a0b7627cd7ae31f1dc", + "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", + "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", + "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", + "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", + "sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79", + "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464" ], "markers": "python_version >= '3.7'", - "version": "==3.4.4" + "version": "==3.4.7" }, "click": { "hashes": [ @@ -461,11 +472,11 @@ }, "msal": { "hashes": [ - "sha256:76ba83b716ea5a6d75b0279c0ac353a0e05b820ca1f6682c0eb7f45190c43c2f", - "sha256:f669b1644e4950115da7a176441b0e13ec2975c29528d8b9e81316023676d6e1" + "sha256:36ecac30e2ff4322d956029aabce3c82301c29f0acb1ad89b94edcabb0e58ec4", + "sha256:3f6a4af2b036b476a4215111c4297b4e6e236ed186cd804faefba23e4990978b" ], "markers": "python_version >= '3.8'", - "version": "==1.34.0" + "version": "==1.36.0" }, "msal-extensions": { "hashes": [ @@ -477,81 +488,81 @@ }, "numpy": { "hashes": [ - "sha256:00ab83c56211a1d7c07c25e3217ea6695e50a3e2f255053686b081dc0b091a82", - "sha256:068cdb2d0d644cdb45670810894f6a0600797a69c05f1ac478e8d31670b8ee75", - "sha256:0f01dcf33e73d80bd8dc0f20a71303abbafa26a19e23f6b68d1aa9990af90257", - "sha256:0fece1d1f0a89c16b03442eae5c56dc0be0c7883b5d388e0c03f53019a4bfd71", - "sha256:12e26134a0331d8dbd9351620f037ec470b7c75929cb8a1537f6bfe411152a1a", - "sha256:1ae241bbfc6ae276f94a170b14785e561cb5e7f626b6688cf076af4110887413", - "sha256:1f92f53998a17265194018d1cc321b2e96e900ca52d54c7c77837b71b9465181", - "sha256:209fae046e62d0ce6435fcfe3b1a10537e858249b3d9b05829e2a05218296a85", - "sha256:20abd069b9cda45874498b245c8015b18ace6de8546bf50dfa8cea1696ed06ef", - "sha256:21982668592194c609de53ba4933a7471880ccbaadcc52352694a59ecc860b3a", - "sha256:25f2059807faea4b077a2b6837391b5d830864b3543627f381821c646f31a63c", - "sha256:2653de5c24910e49c2b106499803124dde62a5a1fe0eedeaecf4309a5f639390", - "sha256:2b8f157c8a6f20eb657e240f8985cc135598b2b46985c5bccbde7616dc9c6b1e", - "sha256:2fb882da679409066b4603579619341c6d6898fc83a8995199d5249f986e8e8f", - "sha256:40397bda92382fcec844066efb11f13e1c9a3e2a8e8f318fb72ed8b6db9f60f1", - "sha256:444be170853f1f9d528428eceb55f12918e4fda5d8805480f36a002f1415e09b", - "sha256:47c5a6ed21d9452b10227e5e8a0e1c22979811cad7dcc19d8e3e2fb8fa03f1a3", - "sha256:4f069069931240b3fc703f1e23df63443dbd6390614c8c44a87d96cd0ec81eb1", - "sha256:52b913ec40ff7ae845687b0b34d8d93b60cb66dcee06996dd5c99f2fc9328657", - "sha256:5633c0da313330fd20c484c78cdd3f9b175b55e1a766c4a174230c6b70ad8262", - "sha256:5daf6f3914a733336dab21a05cdec343144600e964d2fcdabaac0c0269874b2a", - "sha256:5eea80d908b2c1f91486eb95b3fb6fab187e569ec9752ab7d9333d2e66bf2d6b", - "sha256:602f65afdef699cda27ec0b9224ae5dc43e328f4c24c689deaf77133dbee74d0", - "sha256:659a6107e31a83c4e33f763942275fd278b21d095094044eb35569e86a21ddae", - "sha256:66cb9422236317f9d44b67b4d18f44efe6e9c7f8794ac0462978513359461554", - "sha256:6d82351358ffbcdcd7b686b90742a9b86632d6c1c051016484fa0b326a0a1548", - "sha256:6e9f61981ace1360e42737e2bae58b27bf28a1b27e781721047d84bd754d32e7", - "sha256:6ed0be1ee58eef41231a5c943d7d1375f093142702d5723ca2eb07db9b934b05", - "sha256:7cdde6de52fb6664b00b056341265441192d1291c130e99183ec0d4b110ff8b1", - "sha256:7df2de1e4fba69a51c06c28f5a3de36731eb9639feb8e1cf7e4a7b0daf4cf622", - "sha256:7edc794af8b36ca37ef5fcb5e0d128c7e0595c7b96a2318d1badb6fcd8ee86b1", - "sha256:7f54844851cdb630ceb623dcec4db3240d1ac13d4990532446761baede94996a", - "sha256:805cc8de9fd6e7a22da5aed858e0ab16be5a4db6c873dde1d7451c541553aa27", - "sha256:8906e71fd8afcb76580404e2a950caef2685df3d2a57fe82a86ac8d33cc007ba", - "sha256:89f7268c009bc492f506abd6f5265defa7cb3f7487dc21d357c3d290add45082", - "sha256:8c50dd1fc8826f5b26a5ee4d77ca55d88a895f4e4819c7ecc2a9f5905047a443", - "sha256:8e4549f8a3c6d13d55041925e912bfd834285ef1dd64d6bc7d542583355e2e98", - "sha256:8e9afaeb0beff068b4d9cd20d322ba0ee1cecfb0b08db145e4ab4dd44a6b5110", - "sha256:98f16a80e917003a12c0580f97b5f875853ebc33e2eaa4bccfc8201ac6869308", - "sha256:9e35d3e0144137d9fdae62912e869136164534d64a169f86438bc9561b6ad49f", - "sha256:9e4424677ce4b47fe73c8b5556d876571f7c6945d264201180db2dc34f676ab5", - "sha256:adb6ed2ad29b9e15321d167d152ee909ec73395901b70936f029c3bc6d7f4460", - "sha256:aea4f66ff44dfddf8c2cffd66ba6538c5ec67d389285292fe428cb2c738c8aef", - "sha256:b21041e8cb6a1eb5312dd1d2f80a94d91efffb7a06b70597d44f1bd2dfc315ab", - "sha256:b2f0073ed0868db1dcd86e052d37279eef185b9c8db5bf61f30f46adac63c909", - "sha256:b3a24467af63c67829bfaa61eecf18d5432d4f11992688537be59ecd6ad32f5e", - "sha256:b9c618d56a29c9cb1c4da979e9899be7578d2e0b3c24d52079c166324c9e8695", - "sha256:bba37bc29d4d85761deed3954a1bc62be7cf462b9510b51d367b769a8c8df325", - "sha256:bd3a7a9f5847d2fb8c2c6d1c862fa109c31a9abeca1a3c2bd5a64572955b2979", - "sha256:be71bf1edb48ebbbf7f6337b5bfd2f895d1902f6335a5830b20141fc126ffba0", - "sha256:c02ef4401a506fb60b411467ad501e1429a3487abca4664871d9ae0b46c8ba32", - "sha256:c3cd545784805de05aafe1dde61752ea49a359ccba9760c1e5d1c88a93bbf2b7", - "sha256:c7ac672d699bf36275c035e16b65539931347d68b70667d28984c9fb34e07fa7", - "sha256:cb7bbb88aa74908950d979eeaa24dbdf1a865e3c7e45ff0121d8f70387b55f73", - "sha256:cd2bd2bbed13e213d6b55dc1d035a4f91748a7d3edc9480c13898b0353708920", - "sha256:cda077c2e5b780200b6b3e09d0b42205a3d1c68f30c6dceb90401c13bff8fe74", - "sha256:cf28c0c1d4c4bf00f509fa7eb02c58d7caf221b50b467bcb0d9bbf1584d5c821", - "sha256:d0d9b7c93578baafcbc5f0b83eaf17b79d345c6f36917ba0c67f45226911d499", - "sha256:d1240d50adff70c2a88217698ca844723068533f3f5c5fa6ee2e3220e3bdb000", - "sha256:d30291931c915b2ab5717c2974bb95ee891a1cf22ebc16a8006bd59cd210d40a", - "sha256:d9f64d786b3b1dd742c946c42d15b07497ed14af1a1f3ce840cce27daa0ce913", - "sha256:da6cad4e82cb893db4b69105c604d805e0c3ce11501a55b5e9f9083b47d2ffe8", - "sha256:df1b10187212b198dd45fa943d8985a3c8cf854aed4923796e0e019e113a1bda", - "sha256:e04ae107ac591763a47398bb45b568fc38f02dbc4aa44c063f67a131f99346cb", - "sha256:e6dee3bb76aa4009d5a912180bf5b2de012532998d094acee25d9cb8dee3e44a", - "sha256:e7e88598032542bd49af7c4747541422884219056c268823ef6e5e89851c8825", - "sha256:e98c97502435b53741540a5717a6749ac2ada901056c7db951d33e11c885cc7d", - "sha256:ec055f6dae239a6299cace477b479cca2fc125c5675482daf1dd886933a1076f", - "sha256:f74f0f7779cc7ae07d1810aab8ac6b1464c3eafb9e283a40da7309d5e6e48fbb", - "sha256:fbde1b0c6e81d56f5dccd95dd4a711d9b95df1ae4009a60887e56b27e8d903fa", - "sha256:fcf92bee92742edd401ba41135185866f7026c502617f422eb432cfeca4fe236", - "sha256:fd49860271d52127d61197bb50b64f58454e9f578cb4b2c001a6de8b1f50b0b1" + "sha256:07077278157d02f65c43b1b26a3886bce886f95d20aabd11f87932750dfb14ed", + "sha256:08f2e31ed5e6f04b118e49821397f12767934cfdd12a1ce86a058f91e004ee50", + "sha256:0aec54fd785890ecca25a6003fd9a5aed47ad607bbac5cd64f836ad8666f4959", + "sha256:0d35aea54ad1d420c812bfa0385c71cd7cc5bcf7c65fed95fc2cd02fe8c79827", + "sha256:0d4e437e295f18ec29bc79daf55e8a47a9113df44d66f702f02a293d93a2d6dd", + "sha256:0dfd3f9d3adbe2920b68b5cd3d51444e13a10792ec7154cd0a2f6e74d4ab3233", + "sha256:1378871da56ca8943c2ba674530924bb8ca40cd228358a3b5f302ad60cf875fc", + "sha256:15716cfef24d3a9762e3acdf87e27f58dc823d1348f765bbea6bef8c639bfa1b", + "sha256:19710a9ca9992d7174e9c52f643d4272dcd1558c5f7af7f6f8190f633bd651a7", + "sha256:23cbfd4c17357c81021f21540da84ee282b9c8fba38a03b7b9d09ba6b951421e", + "sha256:2483e4584a1cb3092da4470b38866634bafb223cbcd551ee047633fd2584599a", + "sha256:27a8d92cd10f1382a67d7cf4db7ce18341b66438bdd9f691d7b0e48d104c2a9d", + "sha256:28a650663f7314afc3e6ec620f44f333c386aad9f6fc472030865dc0ebb26ee3", + "sha256:2aa0613a5177c264ff5921051a5719d20095ea586ca88cc802c5c218d1c67d3e", + "sha256:2c194dd721e54ecad9ad387c1d35e63dce5c4450c6dc7dd5611283dda239aabb", + "sha256:2d19e6e2095506d1736b7d80595e0f252d76b89f5e715c35e06e937679ea7d7a", + "sha256:2d390634c5182175533585cc89f3608a4682ccb173cc9bb940b2881c8d6f8fa0", + "sha256:30caa73029a225b2d40d9fae193e008e24b2026b7ee1a867b7ee8d96ca1a448e", + "sha256:42c16925aa5a02362f986765f9ebabf20de75cdefdca827d14315c568dcab113", + "sha256:45dbed2ab436a9e826e302fcdcbe9133f9b0006e5af7168afb8963a6520da103", + "sha256:4636de7fd195197b7535f231b5de9e4b36d2c440b6e566d2e4e4746e6af0ca93", + "sha256:4a19d9dba1a76618dd86b164d608566f393f8ec6ac7c44f0cc879011c45e65af", + "sha256:4bbc7f303d125971f60ec0aaad5e12c62d0d2c925f0ab1273debd0e4ba37aba5", + "sha256:4d6d57903571f86180eb98f8f0c839fa9ebbfb031356d87f1361be91e433f5b7", + "sha256:4e874c976154687c1f71715b034739b45c7711bec81db01914770373d125e392", + "sha256:51fc224f7ca4d92656d5a5eb315f12eb5fe2c97a66249aa7b5f562528a3be38c", + "sha256:58c8b5929fcb8287cbd6f0a3fae19c6e03a5c48402ae792962ac465224a629a4", + "sha256:5a285b3b96f951841799528cd1f4f01cd70e7e0204b4abebac9463eecfcf2a40", + "sha256:5c70f1cc1c4efbe316a572e2d8b9b9cc44e89b95f79ca3331553fbb63716e2bf", + "sha256:62d6b0f03b694173f9fcb1fb317f7222fd0b0b103e784c6549f5e53a27718c44", + "sha256:6a246d5914aa1c820c9443ddcee9c02bec3e203b0c080349533fae17727dfd1b", + "sha256:6aa3236c78803afbcb255045fbef97a9e25a1f6c9888357d205ddc42f4d6eba5", + "sha256:6bbe4eb67390b0a0265a2c25458f6b90a409d5d069f1041e6aff1e27e3d9a79e", + "sha256:715d1c092715954784bc79e1174fc2a90093dc4dc84ea15eb14dad8abdcdeb74", + "sha256:72944b19f2324114e9dc86a159787333b77874143efcf89a5167ef83cfee8af0", + "sha256:81f4a14bee47aec54f883e0cad2d73986640c1590eb9bfaaba7ad17394481e6e", + "sha256:846300f379b5b12cc769334464656bc882e0735d27d9726568bc932fdc49d5ec", + "sha256:86b6f55f5a352b48d7fbfd2dbc3d5b780b2d79f4d3c121f33eb6efb22e9a2015", + "sha256:874f200b2a981c647340f841730fc3a2b54c9d940566a3c4149099591e2c4c3d", + "sha256:8a87ec22c87be071b6bdbd27920b129b94f2fc964358ce38f3822635a3e2e03d", + "sha256:8b3b60bb7cba2c8c81837661c488637eee696f59a877788a396d33150c35d842", + "sha256:8e3ed142f2728df44263aaf5fb1f5b0b99f4070c553a0d7f033be65338329150", + "sha256:93e15038125dc1e5345d9b5b68aa7f996ec33b98118d18c6ca0d0b7d6198b7e8", + "sha256:989824e9faf85f96ec9c7761cd8d29c531ad857bfa1daa930cba85baaecf1a9a", + "sha256:99d838547ace2c4aace6c4f76e879ddfe02bb58a80c1549928477862b7a6d6ed", + "sha256:9b2aec6af35c113b05695ebb5749a787acd63cafc83086a05771d1e1cd1e555f", + "sha256:9c585a1790d5436a5374bac930dad6ed244c046ed91b2b2a3634eb2971d21008", + "sha256:a7164afb23be6e37ad90b2f10426149fd75aee07ca55653d2aa41e66c4ef697e", + "sha256:ac6b31e35612a26483e20750126d30d0941f949426974cace8e6b5c58a3657b0", + "sha256:ad2e2ef14e0b04e544ea2fa0a36463f847f113d314aa02e5b402fdf910ef309e", + "sha256:b268594bccac7d7cf5844c7732e3f20c50921d94e36d7ec9b79e9857694b1b2f", + "sha256:b5f0362dc928a6ecd9db58868fca5e48485205e3855957bdedea308f8672ea4a", + "sha256:ba1f4fc670ed79f876f70082eff4f9583c15fb9a4b89d6188412de4d18ae2f40", + "sha256:ba203255017337d39f89bdd58417f03c4426f12beed0440cfd933cb15f8669c7", + "sha256:c901b15172510173f5cb310eae652908340f8dede90fff9e3bf6c0d8dfd92f83", + "sha256:c9b39d38a9bd2ae1becd7eac1303d031c5c110ad31f2b319c6e7d98b135c934d", + "sha256:d2a8490669bfe99a233298348acc2d824d496dee0e66e31b66a6022c2ad74a5c", + "sha256:dddbbd259598d7240b18c9d87c56a9d2fb3b02fe266f49a7c101532e78c1d871", + "sha256:df3775294accfdd75f32c74ae39fcba920c9a378a2fc18a12b6820aa8c1fb502", + "sha256:e44319a2953c738205bf3354537979eaa3998ed673395b964c1176083dd46252", + "sha256:e4a010c27ff6f210ff4c6ef34394cd61470d01014439b192ec22552ee867f2a8", + "sha256:e823b8b6edc81e747526f70f71a9c0a07ac4e7ad13020aa736bb7c9d67196115", + "sha256:e892aff75639bbef0d2a2cfd55535510df26ff92f63c92cd84ef8d4ba5a5557f", + "sha256:eea7ac5d2dce4189771cedb559c738a71512768210dc4e4753b107a2048b3d0e", + "sha256:ef4059d6e5152fa1a39f888e344c73fdc926e1b2dd58c771d67b0acfbf2aa67d", + "sha256:f169b9a863d34f5d11b8698ead99febeaa17a13ca044961aa8e2662a6c7766a0", + "sha256:f2cf083b324a467e1ab358c105f6cad5ea950f50524668a80c486ff1db24e119", + "sha256:f8474c4241bc18b750be2abea9d7a9ec84f46ef861dbacf86a4f6e043401f79e", + "sha256:f983334aea213c99992053ede6168500e5f086ce74fbc4acc3f2b00f5762e9db", + "sha256:f9e75681b59ddaa5e659898085ae0eaea229d054f2ac0c7e563a62205a700121", + "sha256:fbc356aae7adf9e6336d336b9c8111d390a05df88f1805573ebb0807bd06fd1d", + "sha256:fcfe2045fd2e8f3cb0ce9d4ba6dba6333b8fa05bb8a4939c908cd43322d14c7e" ], "markers": "python_version >= '3.11'", - "version": "==2.4.2" + "version": "==2.4.4" }, "pandas": { "hashes": [ @@ -628,11 +639,11 @@ "crypto" ], "hashes": [ - "sha256:35f95c1f0fbe5d5ba6e43f00271c275f7a1a4db1dab27bf708073b75318ea623", - "sha256:94a6bde30eb5c8e04fee991062b534071fd1439ef58d2adc9ccb823e7bcd0469" + "sha256:28ca37c070cad8ba8cd9790cd940535d40274d22f80ab87f3ac6a713e6e8454c", + "sha256:c74a7a2adf861c04d002db713dd85f84beb242228e671280bf709d765b03672b" ], "markers": "python_version >= '3.9'", - "version": "==2.11.0" + "version": "==2.12.1" }, "python-dateutil": { "hashes": [ @@ -644,155 +655,138 @@ }, "pytz": { "hashes": [ - "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3", - "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00" + "sha256:3378dde6a0c3d26719182142c56e60c7f9af7e968076f31aae569d72a0358ee1", + "sha256:f2fd16142fda348286a75e1a524be810bb05d444e5a081f37f7affc635035f7a" ], - "version": "==2025.2" + "version": "==2026.1.post1" }, "regex": { "hashes": [ - "sha256:0057de9eaef45783ff69fa94ae9f0fd906d629d0bd4c3217048f46d1daa32e9b", - "sha256:008b185f235acd1e53787333e5690082e4f156c44c87d894f880056089e9bc7c", - "sha256:05d75a668e9ea16f832390d22131fe1e8acc8389a694c8febc3e340b0f810b93", - "sha256:069f56a7bf71d286a6ff932a9e6fb878f151c998ebb2519a9f6d1cee4bffdba3", - "sha256:0751a26ad39d4f2ade8fe16c59b2bf5cb19eb3d2cd543e709e583d559bd9efde", - "sha256:08df9722d9b87834a3d701f3fca570b2be115654dbfd30179f30ab2f39d606d3", - "sha256:0bda75ebcac38d884240914c6c43d8ab5fb82e74cde6da94b43b17c411aa4c2b", - "sha256:0bf065240704cb8951cc04972cf107063917022511273e0969bdb34fc173456c", - "sha256:0bf650f26087363434c4e560011f8e4e738f6f3e029b85d4904c50135b86cfa5", - "sha256:0dcd31594264029b57bf16f37fd7248a70b3b764ed9e0839a8f271b2d22c0785", - "sha256:0f0c7684c7f9ca241344ff95a1de964f257a5251968484270e91c25a755532c5", - "sha256:124dc36c85d34ef2d9164da41a53c1c8c122cfb1f6e1ec377a1f27ee81deb794", - "sha256:164759aa25575cbc0651bef59a0b18353e54300d79ace8084c818ad8ac72b7d5", - "sha256:166551807ec20d47ceaeec380081f843e88c8949780cd42c40f18d16168bed10", - "sha256:1704d204bd42b6bb80167df0e4554f35c255b579ba99616def38f69e14a5ccb9", - "sha256:18388a62989c72ac24de75f1449d0fb0b04dfccd0a1a7c1c43af5eb503d890f6", - "sha256:194312a14819d3e44628a44ed6fea6898fdbecb0550089d84c403475138d0a09", - "sha256:1ae6020fb311f68d753b7efa9d4b9a5d47a5d6466ea0d5e3b5a471a960ea6e4a", - "sha256:1cb740d044aff31898804e7bf1181cc72c03d11dfd19932b9911ffc19a79070a", - "sha256:1e1808471fbe44c1a63e5f577a1d5f02fe5d66031dcbdf12f093ffc1305a858e", - "sha256:1e8cd52557603f5c66a548f69421310886b28b7066853089e1a71ee710e1cdc1", - "sha256:21ca32c28c30d5d65fc9886ff576fc9b59bbca08933e844fa2363e530f4c8218", - "sha256:2748c1ec0663580b4510bd89941a31560b4b439a0b428b49472a3d9944d11cd8", - "sha256:27618391db7bdaf87ac6c92b31e8f0dfb83a9de0075855152b720140bda177a2", - "sha256:2a8d7b50c34578d0d3bf7ad58cde9652b7d683691876f83aedc002862a35dc5e", - "sha256:2b091aefc05c78d286657cd4db95f2e6313375ff65dcf085e42e4c04d9c8d410", - "sha256:2c2b80399a422348ce5de4fe40c418d6299a0fa2803dd61dc0b1a2f28e280fcf", - "sha256:2f2775843ca49360508d080eaa87f94fa248e2c946bbcd963bb3aae14f333413", - "sha256:3038a62fc7d6e5547b8915a3d927a0fbeef84cdbe0b1deb8c99bbd4a8961b52a", - "sha256:32655d17905e7ff8ba5c764c43cb124e34a9245e45b83c22e81041e1071aee10", - "sha256:343db82cb3712c31ddf720f097ef17c11dab2f67f7a3e7be976c4f82eba4e6df", - "sha256:3601ffb5375de85a16f407854d11cca8fe3f5febbe3ac78fb2866bb220c74d10", - "sha256:3d6ce5ae80066b319ae3bc62fd55a557c9491baa5efd0d355f0de08c4ba54e79", - "sha256:3d7d92495f47567a9b1669c51fc8d6d809821849063d168121ef801bbc213846", - "sha256:40c86d8046915bb9aeb15d3f3f15b6fd500b8ea4485b30e1bbc799dab3fe29f8", - "sha256:4161d87f85fa831e31469bfd82c186923070fc970b9de75339b68f0c75b51903", - "sha256:41aef6f953283291c4e4e6850607bd71502be67779586a61472beacb315c97ec", - "sha256:453078802f1b9e2b7303fb79222c054cb18e76f7bdc220f7530fdc85d319f99e", - "sha256:492534a0ab925d1db998defc3c302dae3616a2fc3fe2e08db1472348f096ddf2", - "sha256:4c5ef43b5c2d4114eb8ea424bb8c9cec01d5d17f242af88b2448f5ee81caadbc", - "sha256:4c8fcc5793dde01641a35905d6731ee1548f02b956815f8f1cab89e515a5bdf1", - "sha256:4def140aa6156bc64ee9912383d4038f3fdd18fee03a6f222abd4de6357ce42a", - "sha256:4e3dd93c8f9abe8aa4b6c652016da9a3afa190df5ad822907efe6b206c09896e", - "sha256:505831646c945e3e63552cc1b1b9b514f0e93232972a2d5bedbcc32f15bc82e3", - "sha256:5170907244b14303edc5978f522f16c974f32d3aa92109fabc2af52411c9433b", - "sha256:55b4ea996a8e4458dd7b584a2f89863b1655dd3d17b88b46cbb9becc495a0ec5", - "sha256:55e9d0118d97794367309635df398bdfd7c33b93e2fdfa0b239661cd74b4c14e", - "sha256:56a5595d0f892f214609c9f76b41b7428bed439d98dc961efafdd1354d42baae", - "sha256:57e7d17f59f9ebfa9667e6e5a1c0127b96b87cb9cede8335482451ed00788ba4", - "sha256:5ef19071f4ac9f0834793af85bd04a920b4407715624e40cb7a0631a11137cdf", - "sha256:5ff818702440a5878a81886f127b80127f5d50563753a28211482867f8318106", - "sha256:619843841e220adca114118533a574a9cd183ed8a28b85627d2844c500a2b0db", - "sha256:621f73a07595d83f28952d7bd1e91e9d1ed7625fb7af0064d3516674ec93a2a2", - "sha256:693b465171707bbe882a7a05de5e866f33c76aa449750bee94a8d90463533cc9", - "sha256:6bfc31a37fd1592f0c4fc4bfc674b5c42e52efe45b4b7a6a14f334cca4bcebe4", - "sha256:6d220a2517f5893f55daac983bfa9fe998a7dbcaee4f5d27a88500f8b7873788", - "sha256:6e42844ad64194fa08d5ccb75fe6a459b9b08e6d7296bd704460168d58a388f3", - "sha256:726ea4e727aba21643205edad8f2187ec682d3305d790f73b7a51c7587b64bdd", - "sha256:74f45d170a21df41508cb67165456538425185baaf686281fa210d7e729abc34", - "sha256:7dcc02368585334f5bc81fc73a2a6a0bbade60e7d83da21cead622faf408f32c", - "sha256:7e1e28be779884189cdd57735e997f282b64fd7ccf6e2eef3e16e57d7a34a815", - "sha256:7ef7d5d4bd49ec7364315167a4134a015f61e8266c6d446fc116a9ac4456e10d", - "sha256:8050ba2e3ea1d8731a549e83c18d2f0999fbc99a5f6bd06b4c91449f55291804", - "sha256:82345326b1d8d56afbe41d881fdf62f1926d7264b2fc1537f99ae5da9aad7913", - "sha256:8355ad842a7c7e9e5e55653eade3b7d1885ba86f124dd8ab1f722f9be6627434", - "sha256:86c1077a3cc60d453d4084d5b9649065f3bf1184e22992bd322e1f081d3117fb", - "sha256:87adf5bd6d72e3e17c9cb59ac4096b1faaf84b7eb3037a5ffa61c4b4370f0f13", - "sha256:8db052bbd981e1666f09e957f3790ed74080c2229007c1dd67afdbf0b469c48b", - "sha256:8dd16fba2758db7a3780a051f245539c4451ca20910f5a5e6ea1c08d06d4a76b", - "sha256:8e32f7896f83774f91499d239e24cebfadbc07639c1494bb7213983842348337", - "sha256:91c5036ebb62663a6b3999bdd2e559fd8456d17e2b485bf509784cd31a8b1705", - "sha256:9250d087bc92b7d4899ccd5539a1b2334e44eee85d848c4c1aef8e221d3f8c8f", - "sha256:9479cae874c81bf610d72b85bb681a94c95722c127b55445285fb0e2c82db8e1", - "sha256:968c14d4f03e10b2fd960f1d5168c1f0ac969381d3c1fcc973bc45fb06346599", - "sha256:97499ff7862e868b1977107873dd1a06e151467129159a6ffd07b66706ba3a9f", - "sha256:99ad739c3686085e614bf77a508e26954ff1b8f14da0e3765ff7abbf7799f952", - "sha256:9d787e3310c6a6425eb346be4ff2ccf6eece63017916fd77fe8328c57be83521", - "sha256:a1774cd1981cd212506a23a14dba7fdeaee259f5deba2df6229966d9911e767a", - "sha256:a30a68e89e5a218b8b23a52292924c1f4b245cb0c68d1cce9aec9bbda6e2c160", - "sha256:adc97a9077c2696501443d8ad3fa1b4fc6d131fc8fd7dfefd1a723f89071cf0a", - "sha256:b0d190e6f013ea938623a58706d1469a62103fb2a241ce2873a9906e0386582c", - "sha256:b10e42a6de0e32559a92f2f8dc908478cc0fa02838d7dbe764c44dca3fa13569", - "sha256:b2a13dd6a95e95a489ca242319d18fc02e07ceb28fa9ad146385194d95b3c829", - "sha256:b30bcbd1e1221783c721483953d9e4f3ab9c5d165aa709693d3f3946747b1aea", - "sha256:b325d4714c3c48277bfea1accd94e193ad6ed42b4bad79ad64f3b8f8a31260a5", - "sha256:b5a28980a926fa810dbbed059547b02783952e2efd9c636412345232ddb87ff6", - "sha256:b5f7d8d2867152cdb625e72a530d2ccb48a3d199159144cbdd63870882fb6f80", - "sha256:bfb0d6be01fbae8d6655c8ca21b3b72458606c4aec9bbc932db758d47aba6db1", - "sha256:bfd876041a956e6a90ad7cdb3f6a630c07d491280bfeed4544053cd434901681", - "sha256:c08c1f3e34338256732bd6938747daa3c0d5b251e04b6e43b5813e94d503076e", - "sha256:c243da3436354f4af6c3058a3f81a97d47ea52c9bd874b52fd30274853a1d5df", - "sha256:c32bef3e7aeee75746748643667668ef941d28b003bfc89994ecf09a10f7a1b5", - "sha256:c661fc820cfb33e166bf2450d3dadbda47c8d8981898adb9b6fe24e5e582ba60", - "sha256:c6c4dcdfff2c08509faa15d36ba7e5ef5fcfab25f1e8f85a0c8f45bc3a30725d", - "sha256:c6c565d9a6e1a8d783c1948937ffc377dd5771e83bd56de8317c450a954d2056", - "sha256:c8a154cf6537ebbc110e24dabe53095e714245c272da9c1be05734bdad4a61aa", - "sha256:c9c08c2fbc6120e70abff5d7f28ffb4d969e14294fb2143b4b5c7d20e46d1714", - "sha256:ca89c5e596fc05b015f27561b3793dc2fa0917ea0d7507eebb448efd35274a70", - "sha256:cc7cd0b2be0f0269283a45c0d8b2c35e149d1319dcb4a43c9c3689fa935c1ee6", - "sha256:cda1ed70d2b264952e88adaa52eea653a33a1b98ac907ae2f86508eb44f65cdc", - "sha256:cf8ff04c642716a7f2048713ddc6278c5fd41faa3b9cab12607c7abecd012c22", - "sha256:cfecdaa4b19f9ca534746eb3b55a5195d5c95b88cac32a205e981ec0a22b7d31", - "sha256:d426616dae0967ca225ab12c22274eb816558f2f99ccb4a1d52ca92e8baf180f", - "sha256:d5eaa4a4c5b1906bd0d2508d68927f15b81821f85092e06f1a34a4254b0e1af3", - "sha256:d639a750223132afbfb8f429c60d9d318aeba03281a5f1ab49f877456448dcf1", - "sha256:d920392a6b1f353f4aa54328c867fec3320fa50657e25f64abf17af054fc97ac", - "sha256:d991483606f3dbec93287b9f35596f41aa2e92b7c2ebbb935b63f409e243c9af", - "sha256:d9ea2604370efc9a174c1b5dcc81784fb040044232150f7f33756049edfc9026", - "sha256:dbaf3c3c37ef190439981648ccbf0c02ed99ae066087dd117fcb616d80b010a4", - "sha256:dca3582bca82596609959ac39e12b7dad98385b4fefccb1151b937383cec547d", - "sha256:e3174a5ed4171570dc8318afada56373aa9289eb6dc0d96cceb48e7358b0e220", - "sha256:e43a55f378df1e7a4fa3547c88d9a5a9b7113f653a66821bcea4718fe6c58763", - "sha256:e69d0deeb977ffe7ed3d2e4439360089f9c3f217ada608f0f88ebd67afb6385e", - "sha256:e85dc94595f4d766bd7d872a9de5ede1ca8d3063f3bdf1e2c725f5eb411159e3", - "sha256:e90b8db97f6f2c97eb045b51a6b2c5ed69cedd8392459e0642d4199b94fabd7e", - "sha256:e9bf3f0bbdb56633c07d7116ae60a576f846efdd86a8848f8d62b749e1209ca7", - "sha256:ea4e6b3566127fda5e007e90a8fd5a4169f0cf0619506ed426db647f19c8454a", - "sha256:ec94c04149b6a7b8120f9f44565722c7ae31b7a6d2275569d2eefa76b83da3be", - "sha256:eddf73f41225942c1f994914742afa53dc0d01a6e20fe14b878a1b1edc74151f", - "sha256:ee6854c9000a10938c79238de2379bea30c82e4925a371711af45387df35cab8", - "sha256:ef71d476caa6692eea743ae5ea23cde3260677f70122c4d258ca952e5c2d4e84", - "sha256:f052d1be37ef35a54e394de66136e30fa1191fab64f71fc06ac7bc98c9a84618", - "sha256:f1862739a1ffb50615c0fde6bae6569b5efbe08d98e59ce009f68a336f64da75", - "sha256:f192a831d9575271a22d804ff1a5355355723f94f31d9eef25f0d45a152fdc1a", - "sha256:f42e68301ff4afee63e365a5fc302b81bb8ba31af625a671d7acb19d10168a8c", - "sha256:f7792f27d3ee6e0244ea4697d92b825f9a329ab5230a78c1a68bd274e64b5077", - "sha256:f82110ab962a541737bd0ce87978d4c658f06e7591ba899192e2712a517badbb", - "sha256:f9ca1cbdc0fbfe5e6e6f8221ef2309988db5bcede52443aeaee9a4ad555e0dac", - "sha256:fd65af65e2aaf9474e468f9e571bd7b189e1df3a61caa59dcbabd0000e4ea839", - "sha256:fe2fda4110a3d0bc163c2e0664be44657431440722c5c5315c65155cab92f9e5", - "sha256:febd38857b09867d3ed3f4f1af7d241c5c50362e25ef43034995b77a50df494e" + "sha256:011bb48bffc1b46553ac704c975b3348717f4e4aa7a67522b51906f99da1820c", + "sha256:04bb679bc0bde8a7bfb71e991493d47314e7b98380b083df2447cda4b6edb60f", + "sha256:0540e5b733618a2f84e9cb3e812c8afa82e151ca8e19cf6c4e95c5a65198236f", + "sha256:05568c4fbf3cb4fa9e28e3af198c40d3237cf6041608a9022285fe567ec3ad62", + "sha256:0709f22a56798457ae317bcce42aacee33c680068a8f14097430d9f9ba364bee", + "sha256:0734f63afe785138549fbe822a8cfeaccd1bae814c5057cc0ed5b9f2de4fc883", + "sha256:07edca1ba687998968f7db5bc355288d0c6505caa7374f013d27356d93976d13", + "sha256:07f190d65f5a72dcb9cf7106bfc3d21e7a49dd2879eda2207b683f32165e4d99", + "sha256:08c55c13d2eef54f73eeadc33146fb0baaa49e7335eb1aff6ae1324bf0ddbe4a", + "sha256:0a51cdb3c1e9161154f976cb2bef9894bc063ac82f31b733087ffb8e880137d0", + "sha256:1371c2ccbb744d66ee63631cc9ca12aa233d5749972626b68fe1a649dd98e566", + "sha256:173a66f3651cdb761018078e2d9487f4cf971232c990035ec0eb1cdc6bf929a9", + "sha256:1b1ce5c81c9114f1ce2f9288a51a8fd3aeea33a0cc440c415bf02da323aa0a76", + "sha256:1b9a00b83f3a40e09859c78920571dcb83293c8004079653dd22ec14bbfa98c7", + "sha256:21e5eb86179b4c67b5759d452ea7c48eb135cd93308e7a260aa489ed2eb423a4", + "sha256:261c015b3e2ed0919157046d768774ecde57f03d8fa4ba78d29793447f70e717", + "sha256:2895506ebe32cc63eeed8f80e6eae453171cfccccab35b70dc3129abec35a5b8", + "sha256:298c3ec2d53225b3bf91142eb9691025bab610e0c0c51592dde149db679b3d17", + "sha256:2a5d273181b560ef8397c8825f2b9d57013de744da9e8257b8467e5da8599351", + "sha256:2b69102a743e7569ebee67e634a69c4cb7e59d6fa2e1aa7d3bdbf3f61435f62d", + "sha256:2c785939dc023a1ce4ec09599c032cc9933d258a998d16ca6f2b596c010940eb", + "sha256:2da82d643fa698e5e5210e54af90181603d5853cf469f5eedf9bfc8f59b4b8c7", + "sha256:2e19e18c568d2866d8b6a6dfad823db86193503f90823a8f66689315ba28fbe8", + "sha256:312ec9dd1ae7d96abd8c5a36a552b2139931914407d26fba723f9e53c8186f86", + "sha256:33424f5188a7db12958246a54f59a435b6cb62c5cf9c8d71f7cc49475a5fdada", + "sha256:3384df51ed52db0bea967e21458ab0a414f67cdddfd94401688274e55147bb81", + "sha256:33bfda9684646d323414df7abe5692c61d297dbb0530b28ec66442e768813c59", + "sha256:349d7310eddff40429a099c08d995c6d4a4bfaf3ff40bd3b5e5cb5a5a3c7d453", + "sha256:36bcb9d6d1307ab629edc553775baada2aefa5c50ccc0215fbfd2afcfff43141", + "sha256:3790ba9fb5dd76715a7afe34dbe603ba03f8820764b1dc929dd08106214ed031", + "sha256:385edaebde5db5be103577afc8699fea73a0e36a734ba24870be7ffa61119d74", + "sha256:39d8de85a08e32632974151ba59c6e9140646dcc36c80423962b1c5c0a92e244", + "sha256:415a994b536440f5011aa77e50a4274d15da3245e876e5c7f19da349caaedd87", + "sha256:421439d1bee44b19f4583ccf42670ca464ffb90e9fdc38d37f39d1ddd1e44f1f", + "sha256:475e50f3f73f73614f7cba5524d6de49dee269df00272a1b85e3d19f6d498465", + "sha256:4ce255cc05c1947a12989c6db801c96461947adb7a59990f1360b5983fab4983", + "sha256:504ffa8a03609a087cad81277a629b6ce884b51a24bd388a7980ad61748618ff", + "sha256:50a766ee2010d504554bfb5f578ed2e066898aa26411d57e6296230627cdefa0", + "sha256:54170b3e95339f415d54651f97df3bff7434a663912f9358237941bbf9143f55", + "sha256:54a1189ad9d9357760557c91103d5e421f0a2dabe68a5cdf9103d0dcf4e00752", + "sha256:55d9304e0e7178dfb1e106c33edf834097ddf4a890e2f676f6c5118f84390f73", + "sha256:586b89cdadf7d67bf86ae3342a4dcd2b8d70a832d90c18a0ae955105caf34dbe", + "sha256:59968142787042db793348a3f5b918cf24ced1f23247328530e063f89c128a95", + "sha256:59efe72d37fd5a91e373e5146f187f921f365f4abc1249a5ab446a60f30dd5f8", + "sha256:59f67cd0a0acaf0e564c20bbd7f767286f23e91e2572c5703bf3e56ea7557edb", + "sha256:5d354b18839328927832e2fa5f7c95b7a3ccc39e7a681529e1685898e6436d45", + "sha256:62f5519042c101762509b1d717b45a69c0139d60414b3c604b81328c01bd1943", + "sha256:6780f008ee81381c737634e75c24e5a6569cc883c4f8e37a37917ee79efcafd9", + "sha256:6a50ab11b7779b849472337191f3a043e27e17f71555f98d0092fa6d73364520", + "sha256:6aa809ed4dc3706cc38594d67e641601bd2f36d5555b2780ff074edfcb136cf8", + "sha256:6c1818f37be3ca02dcb76d63f2c7aaba4b0dc171b579796c6fbe00148dfec6b1", + "sha256:6dac006c8b6dda72d86ea3d1333d45147de79a3a3f26f10c1cf9287ca4ca0ac3", + "sha256:7088fcdcb604a4417c208e2169715800d28838fefd7455fbe40416231d1d47c1", + "sha256:70aadc6ff12e4b444586e57fc30771f86253f9f0045b29016b9605b4be5f7dfb", + "sha256:7429f4e6192c11d659900c0648ba8776243bf396ab95558b8c51a345afeddde6", + "sha256:74fa82dcc8143386c7c0392e18032009d1db715c25f4ba22d23dc2e04d02a20f", + "sha256:760ef21c17d8e6a4fe8cf406a97cf2806a4df93416ccc82fc98d25b1c20425be", + "sha256:7698a6f38730fd1385d390d1ed07bb13dce39aa616aca6a6d89bea178464b9a4", + "sha256:76d67d5afb1fe402d10a6403bae668d000441e2ab115191a804287d53b772951", + "sha256:773d1dfd652bbffb09336abf890bfd64785c7463716bf766d0eb3bc19c8b7f27", + "sha256:7d346fccdde28abba117cc9edc696b9518c3307fbfcb689e549d9b5979018c6d", + "sha256:8512fcdb43f1bf18582698a478b5ab73f9c1667a5b7548761329ef410cd0a760", + "sha256:867bddc63109a0276f5a31999e4c8e0eb7bbbad7d6166e28d969a2c1afeb97f9", + "sha256:88e9b048345c613f253bea4645b2fe7e579782b82cac99b1daad81e29cc2ed8e", + "sha256:8fae3c6e795d7678963f2170152b0d892cf6aee9ee8afc8c45e6be38d5107fe7", + "sha256:9542ccc1e689e752594309444081582f7be2fdb2df75acafea8a075108566735", + "sha256:9776b85f510062f5a75ef112afe5f494ef1635607bf1cc220c1391e9ac2f5e81", + "sha256:97850d0638391bdc7d35dc1c1039974dcb921eaafa8cc935ae4d7f272b1d60b3", + "sha256:993f657a7c1c6ec51b5e0ba97c9817d06b84ea5fa8d82e43b9405de0defdc2b9", + "sha256:9a2741ce5a29d3c84b0b94261ba630ab459a1b847a0d6beca7d62d188175c790", + "sha256:9e2f5217648f68e3028c823df58663587c1507a5ba8419f4fdfc8a461be76043", + "sha256:a0d2b28aa1354c7cd7f71b7658c4326f7facac106edd7f40eda984424229fd59", + "sha256:a152560af4f9742b96f3827090f866eeec5becd4765c8e0d3473d9d280e76a5a", + "sha256:a1c0c7d67b64d85ac2e1879923bad2f08a08f3004055f2f406ef73c850114bd4", + "sha256:a7a5bb6aa0cf62208bb4fa079b0c756734f8ad0e333b425732e8609bd51ee22f", + "sha256:a85b620a388d6c9caa12189233109e236b3da3deffe4ff11b84ae84e218a274f", + "sha256:acd38177bd2c8e69a411d6521760806042e244d0ef94e2dd03ecdaa8a3c99427", + "sha256:ae3e764bd4c5ff55035dc82a8d49acceb42a5298edf6eb2fc4d328ee5dd7afae", + "sha256:ae5266a82596114e41fb5302140e9630204c1b5f325c770bec654b95dd54b0aa", + "sha256:af0384cb01a33600c49505c27c6c57ab0b27bf84a74e28524c92ca897ebdac9d", + "sha256:b15b88b0d52b179712632832c1d6e58e5774f93717849a41096880442da41ab0", + "sha256:b26c30df3a28fd9793113dac7385a4deb7294a06c0f760dd2b008bd49a9139bc", + "sha256:b40379b53ecbc747fd9bdf4a0ea14eb8188ca1bd0f54f78893a39024b28f4863", + "sha256:b4c36a85b00fadb85db9d9e90144af0a980e1a3d2ef9cd0f8a5bef88054657c6", + "sha256:b5f9fb784824a042be3455b53d0b112655686fdb7a91f88f095f3fee1e2a2a54", + "sha256:be061028481186ba62a0f4c5f1cc1e3d5ab8bce70c89236ebe01023883bc903b", + "sha256:c07ab8794fa929e58d97a0e1796b8b76f70943fa39df225ac9964615cf1f9d52", + "sha256:c228cf65b4a54583763645dcd73819b3b381ca8b4bb1b349dee1c135f4112c07", + "sha256:c4ee50606cb1967db7e523224e05f32089101945f859928e65657a2cbb3d278b", + "sha256:c882cd92ec68585e9c1cf36c447ec846c0d94edd706fe59e0c198e65822fd23b", + "sha256:cf9b1b2e692d4877880388934ac746c99552ce6bf40792a767fd42c8c99f136d", + "sha256:d2228c02b368d69b724c36e96d3d1da721561fb9cc7faa373d7bf65e07d75cb5", + "sha256:d51d20befd5275d092cdffba57ded05f3c436317ee56466c8928ac32d960edaf", + "sha256:db0ac18435a40a2543dbb3d21e161a6c78e33e8159bd2e009343d224bb03bb1b", + "sha256:dc4f10fbd5dd13dcf4265b4cc07d69ca70280742870c97ae10093e3d66000359", + "sha256:dcb5453ecf9cd58b562967badd1edbf092b0588a3af9e32ee3d05c985077ce87", + "sha256:dd2630faeb6876fb0c287f664d93ddce4d50cd46c6e88e60378c05c9047e08ca", + "sha256:e014a797de43d1847df957c0a2a8e861d1c17547ee08467d1db2c370b7568baa", + "sha256:e08270659717f6973523ce3afbafa53515c4dc5dcad637dc215b6fd50f689423", + "sha256:e0aab3ff447845049d676827d2ff714aab4f73f340e155b7de7458cf53baa5a4", + "sha256:e355be718caf838aa089870259cf1776dc2a4aa980514af9d02c59544d9a8b22", + "sha256:e7ab63e9fe45a9ec3417509e18116b367e89c9ceb6219222a3396fa30b147f80", + "sha256:e7cd3e4ee8d80447a83bbc9ab0c8459781fa77087f856c3e740d7763be0df27f", + "sha256:e9638791082eaf5b3ac112c587518ee78e083a11c4b28012d8fe2a0f536dfb17", + "sha256:eb59c65069498dbae3c0ef07bbe224e1eaa079825a437fb47a479f0af11f774f", + "sha256:ee7337f88f2a580679f7bbfe69dc86c043954f9f9c541012f49abc554a962f2e", + "sha256:ee9627de8587c1a22201cb16d0296ab92b4df5cdcb5349f4e9744d61db7c7c98", + "sha256:f4f83781191007b6ef43b03debc35435f10cad9b96e16d147efe84a1d48bdde4", + "sha256:f56ebf9d70305307a707911b88469213630aba821e77de7d603f9d2f0730687d", + "sha256:f5bfc2741d150d0be3e4a0401a5c22b06e60acb9aa4daa46d9e79a6dcd0f135b", + "sha256:f94a11a9d05afcfcfa640e096319720a19cc0c9f7768e1a61fceee6a3afc6c7c", + "sha256:fa7922bbb2cc84fa062d37723f199d4c0cd200245ce269c05db82d904db66b83", + "sha256:fe896e07a5a2462308297e515c0054e9ec2dd18dfdc9427b19900b37dfe6f40b", + "sha256:ffa81f81b80047ba89a3c69ae6a0f78d06f4a42ce5126b0eb2a0a10ad44e0b2e" ], - "markers": "python_version >= '3.9'", - "version": "==2026.1.15" + "markers": "python_version >= '3.10'", + "version": "==2026.4.4" }, "requests": { "hashes": [ - "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", - "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf" + "sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517", + "sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a" ], - "markers": "python_version >= '3.9'", - "version": "==2.32.5" + "markers": "python_version >= '3.10'", + "version": "==2.33.1" }, "semver": { "hashes": [ @@ -820,6 +814,11 @@ "markers": "python_version >= '3.7'", "version": "==0.9.0" }, + "trakka": { + "editable": true, + "markers": "python_version >= '3.9' and python_version < '4'", + "path": "." + }, "typing-extensions": { "hashes": [ "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", @@ -830,11 +829,11 @@ }, "tzdata": { "hashes": [ - "sha256:06a47e5700f3081aab02b2e513160914ff0694bce9947d6b76ebd6bf57cfc5d1", - "sha256:de39c2ca5dc7b0344f2eba86f49d614019d29f060fc4ebc8a417896a620b56a7" + "sha256:4b1d2be7ac37ceafd7327b961aa3a54e467efbdb563a23655fbfe0d39cfc42a9", + "sha256:67658a1903c75917309e753fdc349ac0efd8c27db7a0cb406a25be4840f87f98" ], "markers": "python_version >= '2'", - "version": "==2025.3" + "version": "==2026.1" }, "tzlocal": { "hashes": [ @@ -873,11 +872,11 @@ }, "attrs": { "hashes": [ - "sha256:16d5969b87f0859ef33a48b35d55ac1be6e42ae49d5e853b597db70c35c57e11", - "sha256:adcf7e2a1fb3b36ac48d97835bb6d8ade15b8dcce26aba8bf1d14847b57a3373" + "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", + "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32" ], "markers": "python_version >= '3.9'", - "version": "==25.4.0" + "version": "==26.1.0" }, "autopep8": { "hashes": [ @@ -898,12 +897,12 @@ }, "cx-freeze": { "hashes": [ - "sha256:772e41ada72467365342d521f42f124663db51882f6ba495bf88dec399dc6511", - "sha256:ceafd2ceaf38a93bb562d5d97028b20d12456d578fc47c3545827a3656f81437" + "sha256:16227706ad06b4b96f77c48980e2b363f0302c971f66c6b05567fd63a27596a4", + "sha256:37f1ac07d1c2f5e6e28eaf71bc24cb8300045d5e9998447fdc9662471ce6df88" ], "index": "pypi", "markers": "python_version >= '3.10'", - "version": "==8.5.3" + "version": "==8.6.4" }, "dill": { "hashes": [ @@ -931,84 +930,84 @@ }, "filelock": { "hashes": [ - "sha256:011a5644dc937c22699943ebbfc46e969cdde3e171470a6e40b9533e5a72affa", - "sha256:426e9a4660391f7f8a810d71b0555bce9008b0a1cc342ab1f6947d37639e002d" + "sha256:69974355e960702e789734cb4871f884ea6fe50bd8404051a3530bc07809cf90", + "sha256:96f5f6344709aa1572bbf631c640e4ebeeb519e08da902c39a001882f30ac258" ], "markers": "python_version >= '3.10'", - "version": "==3.24.3" + "version": "==3.29.0" }, "freeze-core": { "hashes": [ - "sha256:0849f808d08a62ed11ed418d49aee7de7ca4633e0e2d310959adc53789d54e45", - "sha256:08b439e3b0d9361267ba6c426e19c3dd7946eae7c173785242dcf1fd74554a03", - "sha256:0a5ceeba306023dff2903ff2c8c0e13e7dd4118daf8e5c90773252da4148e0ca", - "sha256:0a8203bd1a7610e7aaefe47e947b7f38dc58f09d64894a19122f52f228d74dae", - "sha256:0beb01dbb64ba94aeaa0fb00d466dfcbfefa5c3f3afbaee06ab5d11a23c916fd", - "sha256:1b0fa69e10d44dd618de61920071d3b19a6b72f0f63414f39bc55d2a2a6050e2", - "sha256:212adaf4c1051cbbdc059223971abe65fdac499638b70a898766dfacf5393e4e", - "sha256:23fd7dd5a3b565d7f308c6f6a79689640ac9280378c2feefe7be1783c1a13dd5", - "sha256:243406eca5ddf22a29cb6bf860217f9cbf5db1b6bdbed6957a441ca877d28bd6", - "sha256:24e08cc061ea0afdb6ce246b9913b07ad4e5b82d317fe315ee2f94b3473e9c74", - "sha256:266691389aa3b96f76c78ee6f3fd426ed1280837084f6bcbbf8bcdbf25316851", - "sha256:2867f6dd9369dd4bec9481a80bbe96f3b8f6940ca66c8a62cd4378e67e801093", - "sha256:2ca075fd06b7388b736ae768343d5c1e22e4209256b16fe20deee2b29a772c4b", - "sha256:2d1363bad9584ba193a19608f461ba9ab3dbbe677350a29150b2918038b1a083", - "sha256:2efa7576d63874506a5c0876fc262787781ef177e7db9328e675e9f3709a5b71", - "sha256:30951db9472c11b84cd35f4aea976e178311776318afef31c1cfb9c53c206371", - "sha256:3607538ab2d49da42ef5ce28607e81b162ec6123346b843289a81427c91d1c20", - "sha256:372c9cb7086b9a7a5067fee99ee4787587de021281db33f1ee2789ac8f3ddf44", - "sha256:372f817e850bf5689915aec68457170527380ec0a23c3fa929f5f68407cb7eda", - "sha256:3c86b15a48c337a96fd6a92bfd77455cbb31dfad95d0b8bc0bb5cfdcb3924f39", - "sha256:3ef7416fc7f4a6f664d5544eb2d6af2b85b9797b3aa5fc62a1934413faa48a0e", - "sha256:3f4f8a04ae1904364d028ce751113bedfa2ea4a2fffff67b5007eab34d7789ca", - "sha256:42362c21a9d641565cabbe0f3c30e24b1d7176b09f14be59f03c80f7a35738b2", - "sha256:46008c27e0e44bd97e283f2fb21df5190c555ff8dd2b008e6205f03f87f8c2c4", - "sha256:5ba6cf9cc7c19ca416d8a8c052b9f2faa120a97295762f949526fc974153a1fb", - "sha256:690ba7bdf395ce3a10bf51f7cc154e4fd3015705f84f06351c0207788c4fbbbb", - "sha256:691b11f76845bf4a4034001f4237a4626c7dffce4e822ea00fabc6377cf8cc52", - "sha256:6b4a71dfc4e24440dba849630f97de4be3bd087a270a61802586542f82ae0118", - "sha256:6b5b1c455f6e5baa6257082a30ffb72ef3ee97e13b841f353d991aaef780ba9c", - "sha256:71b6459b856fc4551d39e3e9b65e9ebaa263586cbad4644709826b103bbb0e3e", - "sha256:88b304972b990f068b14c774ae7e6af9892f0e013c75eb1990b52116f23a0a58", - "sha256:8dbd0aaa842c2e836792ba75e76e29f52e6cf8870ebc81e411ba75f03bf59df7", - "sha256:91c108a0ffa984dc1d6dcfe856d58d653067d9667627d61201328bd684b962b1", - "sha256:9530eb7742f032197a15fc4a50cc12ec17619bdecf1f68c0ef0523e75d251b9a", - "sha256:97b467a5bab5d3bcdeebc307aa31f8b6933691676b9aa97a5515d591f2af6d29", - "sha256:9c05e65ab86bf2219d7756f3862f5bf9bdee74df7081c3f6e4ffbadaec45b128", - "sha256:a04dd2bd276b99059afec577371fed3fcb259abd2181e442662fb4e2114c29a2", - "sha256:a67b5d9c47209651b417eea3e0a5ea73a37ac011c20424ce4decd82c5252a1bf", - "sha256:a7decda0e71370a7f5271aabad4d31dce0eb013e17a3ed895cf867dec3fad1d2", - "sha256:aeb9376a9e28f54fce1b40d2d1f25751560e0b909efd8bcb3beaf50658e03757", - "sha256:b2f83fbd3c7a019590e7b8530fc3a7a2c5ef73a54f33efabfc0398c37c935511", - "sha256:b32afd9731ed243cc715a4b5da47b7d34db451e523c2eba56632c59563ce1fda", - "sha256:b4dab0ca7a14a05b81942c74d79e2c88882388a98e8d22115175cc29b5bf9efb", - "sha256:ba47dbba3017e2a2ee27de01bda9b29d0ec149ae6817f86d0ec5641590ed6d47", - "sha256:c0ced843f46dbd06fe771f5bc131f20f89c8b16e5f451fbd63b4302fd1d94fb1", - "sha256:c21c73410991507d5a4f639e9f8403c99c1386914e3ff78a891db361cdc72f4b", - "sha256:c5e4a1a6c68bd4d640bdee1f1e180be2f61f3d189045d6a07dc454abfbe81d6f", - "sha256:cd12382f42d3293bf690faf881a52ec838b7fa33366908a30ff6901ca0aa5217", - "sha256:cdf4dd0825b10e781fa8d8675568f2b04b2a930dd21e73380a196754e123bdff", - "sha256:d19a1e32fbf2de503011ec88f54bf2da72e547a7e3c41d73a9dfea624add8df2", - "sha256:d22157ef71c7e967ad4e58954e715fa9d8d92a9cb2fed222b4b72176c8512562", - "sha256:d36bb2238d031269a6b4a25d15c78dec35665086218bd8f3768947c3f26f9f34", - "sha256:dda35ed64cd9693162d8524c1b1d31370e8ce80257e0a26e09d0bfbc068949ad", - "sha256:de3f9b0ba6e2022a2a6bd47ec2e3af06740c2fd62924c217d688ca0bd9d99c5a", - "sha256:e98254d926402a8bfa147b88f5fcf194b27117933cd27937400864a538a4c3b5", - "sha256:f099bf5f67b5a3c704c47a4e05039658ea3be321ffc5050823f6ad84456272d1", - "sha256:f8cd550bcd8531e986dcdc6f105705882a5b9cd22dba7e724dd58d0844231b9a", - "sha256:f9f78415a9e3b36dafdb1418c09734ec2dbc390fcb70a821ef25369fc8e1ab41", - "sha256:fe7084aafade2baacac36bbd50dd9053b8c695aa84e08df0a66a8ac9b213582c" + "sha256:06d16f47c4c218c90514d915f3dda161ed6dcd7dcb9ad147db51e7b057eb27ee", + "sha256:074d26fb9c3d4da2a5dc93a70d3353456316b4dea2055bad98bf4e45e79899e9", + "sha256:079c4ffc500212382d3a131fd2e691e8103b2cdaca40f6fcff475e35cef86cd8", + "sha256:0b371c9d58393d22617f31696851dccdde7eef80cfffb99195168e27e6900701", + "sha256:0c683acd149c9f22d0574880f64b225e07b430612fd98dbad7e1d3f2261ab30d", + "sha256:12f838b25d21eac6f1cc254e9325daa3949da0bb06ad28aa9a4ea26b88b8eaa9", + "sha256:134f3811dd21ea86cff52ad94f4c241405aa51e74fac9fba4a15d6ea9c886ed8", + "sha256:19b1f39e3b27aae437f08ad2429f1ef276f4839576e1c6cc242456c426c1239a", + "sha256:1c95b6d5e7b490582d81fad84bc54e6144dc581ff9f36e10f2c221373ac9e1ca", + "sha256:1e5a83273ea3f1ba5675bbc90e8ef6fb9c84b4c704ecb99fc00aa72ac609051f", + "sha256:1f7ae8d098fd961d7f3590cfcfb0f27a7e5cae1176e486238a73d91494ed7501", + "sha256:2055268857aabcb9f0e7e951f1dffc236830348fd7307a0dd0f92122c91ff8b9", + "sha256:21fd14fe82eaab8f7c2514fca3439f49c72061978615c364997912cf38572a18", + "sha256:26caca8bab204d9b1f9dff35560e1bd403ddaedb0b6f4215eacc0550ed7fb59d", + "sha256:2e80cc5c2cfd52baeff9ce2d3cdee549cae594d242d5c88ffe6bc99986e50f11", + "sha256:3431b2b4ccf729b13ed87d165a313ac990241f4e98fc807f25c1e753edac0d6b", + "sha256:3848872c2113ed2c636dfd0da2c917d58d150dfc44d56d43ec3f10b8f9da2fb9", + "sha256:38a125a88437585c2c119beb9f4dacb2f4d43bcd636dc126bf198a1a5271224d", + "sha256:3dd8adf9d6acb4c44785f3f3e317f3ba8a494bda7c14e24da096602bb687dc29", + "sha256:3e6c2980d0f2ae385e4fe9114e79723d64f85c53c4e49ff57231b1050bcf2c7c", + "sha256:4379f1145d329a2232435cef7f8ea3342aa5e24dfe2db003a3df18751ab02627", + "sha256:46f177017e9f9c75b0710a63597fe259f41f57221bbee3f00b66784642a52807", + "sha256:4baa5ea7ba5e802de724ac9cf2a42a4888e8f5510ecca944a9005cf223ec6d63", + "sha256:4e34682706745f6eb347f6df9e59fc31d5c68666bb6f4257631872f4ffbd4bb1", + "sha256:52f31c454c3a9a063ab1ea49fa2ceca22b2046a3cae838b0753cd99589edb484", + "sha256:54d8a89df1bd34dc10f7f5d95d9d4c326652a7a83ebfc06d2bfe0415580c6fec", + "sha256:5512d1430e445d5511900c07cca35d2ccb1ab109b9a0e7117a163cc5d10bc8fb", + "sha256:58b237d75fc88051c99e7a6201068a118b20df4f72a1375cdb7aa3ca728c2d00", + "sha256:5bfb220a525fa130864b3eb6ebc9f44002d6fec74df82d9366f9dafc89513c20", + "sha256:630fcd320c03a2f30d6b642eea3930915d770974bc4584cef1794ee3e5f1809f", + "sha256:665b7dabd8be0566122bd311b0a6c90813eb6c21b8c1e8006c092186aff858ec", + "sha256:6c699bd210e438d176793d78a13f8eebceb7a5c046cf319ec67d37f3ade8ee19", + "sha256:71b249ce8bd393a75a47e87c2705e45dd5ff6ab12af1a663f78e1c29d48a96c6", + "sha256:74a93871bc08104ab6c382cc70bc96ac15a16e62ddf13f28721616e87857c948", + "sha256:7586d30f1abd2b5aebf6e88ca6262f360dbbd249908e6bfc33534d1ac8438627", + "sha256:75ae95e29440970115c6467fddd56ff0349ef7c0d633c22118c14fc6a7a09824", + "sha256:7e72b5232308369cf20ee8f4519daab7458ca00a93b310922f867effc57762fa", + "sha256:819642aa58b4e2c19e1ade025d9563e437c07c90fe6ac5c891e8ecee2044a2ef", + "sha256:913a1e4668cf56182aaa834783c29c9c13c717ee93c6039f2b840b6ce0f265d8", + "sha256:a823721f8b07de0700feef2342ad45f685c044193e480c81d483ab6f8b911d89", + "sha256:ac1ca1897e08aab3e377d513f87724ccf1649f0c71c3aad4ff3ee640577b34d4", + "sha256:ae7162d863b73ff62f06e12185f62d57a0296da800523932ac62886950a72f85", + "sha256:b3e1e4940c459a72ab6b3151ac9ad4a692550980ef1deb11b760e49e65e6cd9b", + "sha256:b544c6ea15b65364a87c22566c06e9f11ac2ee861f3d4d7ff7fc9679287e7954", + "sha256:bcc743c9d1050f676eed05c821b02030f8e50bf35d38619a40627a5ce8a64f4e", + "sha256:be128cb726c62c806a77c32855a9706c24b4fbfc018b6f0a0b0268fabdd4cfca", + "sha256:c050f70064085acf1a7c29e51ae15b42bf6741c1d71656c1ea49fca0fdded0e7", + "sha256:ca65c4d3c5191da679653f35151671d84418713343c3b20563b658533e625f33", + "sha256:ccd31f02d3f5b4492bb647859939a906f0c1b3615101a935beae75c81a3eafe6", + "sha256:cd74353a0c1cdcf3497072b3f06884ac9c9a3966f20f43a3be665e53c5abdbe1", + "sha256:cf262d8907385ae6cafeca054b9c05cdb360e1646a0fb67248bf614296cd3c07", + "sha256:d2d51ecb6e4e646ba5fae75bd36b036f6bf9b483cb702b38922b4598f2ba9fa6", + "sha256:d6a44251d55f9fc1d4b20486e3a73c1d8bd13cd7998eca5c87622e22a3f0f258", + "sha256:ddcf1f706f887fb39d181a2a2709a3b6c75ba3f86d8fcdfa49b81f9ed159ecc0", + "sha256:e612bab462ae284cf277f210f5635951309ec360c1aa3f71010512005511d099", + "sha256:f5d27a6e6adeb544880e60c13432ae346abd5be8fd843b663e867e168826c524", + "sha256:fa2a186ca05672160e20f4a566090b35c47fd8d542922011f16a341c240ed5e4", + "sha256:fb37cadba23e8e6c16622aa6ddf630dbf27e06739fb7c8cc2532f50c3a48563a", + "sha256:ffdbff036c06612e7bcc47d9f83d34717099611986e07637c39f01ab1c28ca18" ], "markers": "python_version >= '3.10'", - "version": "==0.6.0" + "version": "==0.6.1" }, "importlib-resources": { "hashes": [ - "sha256:185f87adef5bcc288449d98fb4fba07cea78bc036455dd44c5fc4a2fe78fed2c", - "sha256:789cfdc3ed28c78b67a06acb8126751ced69a3d5f79c095a98298cd8a760ccec" + "sha256:0722d4c6212489c530f2a145a34c0a7a3b4721bc96a15fada5930e2a0b760708", + "sha256:1bd7b48b4088eddb2cd16382150bb515af0bd2c70128194392725f82ad2c96a1" ], - "markers": "python_version >= '3.9'", - "version": "==6.5.2" + "markers": "python_version >= '3.10'", + "version": "==7.1.0" }, "iniconfig": { "hashes": [ @@ -1044,19 +1043,19 @@ }, "packaging": { "hashes": [ - "sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4", - "sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529" + "sha256:5d9c0669c6285e491e0ced2eee587eaf67b670d94a19e94e3984a481aba6802f", + "sha256:f042152b681c4bfac5cae2742a55e103d27ab2ec0f3d88037136b6bfe7c9c5de" ], "markers": "python_version >= '3.8'", - "version": "==26.0" + "version": "==26.1" }, "platformdirs": { "hashes": [ - "sha256:9170634f126f8efdae22fb58ae8a0eaa86f38365bc57897a6c4f781d1f5875bd", - "sha256:9a33809944b9db043ad67ca0db94b14bf452cc6aeaac46a88ea55b26e2e9d291" + "sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a", + "sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917" ], "markers": "python_version >= '3.10'", - "version": "==4.9.2" + "version": "==4.9.6" }, "pluggy": { "hashes": [ @@ -1077,11 +1076,11 @@ }, "pygments": { "hashes": [ - "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", - "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b" + "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", + "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176" ], - "markers": "python_version >= '3.8'", - "version": "==2.19.2" + "markers": "python_version >= '3.9'", + "version": "==2.20.0" }, "pylint": { "hashes": [ @@ -1119,11 +1118,11 @@ }, "setuptools": { "hashes": [ - "sha256:8b0e9d10c784bf7d262c4e5ec5d4ec94127ce206e8738f29a437945fbc219b70", - "sha256:95b30ddfb717250edb492926c92b5221f7ef3fbcc2b07579bcd4a27da21d0173" + "sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9", + "sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb" ], "markers": "python_version >= '3.9'", - "version": "==80.10.2" + "version": "==82.0.1" }, "tomlkit": { "hashes": [ diff --git a/README.md b/README.md index dc09eb86..bed897cf 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# AusTrakka CLI +# Trakka CLI -Command line interface for AusTrakka APIs. +Command line interface for Trakka APIs. ## Getting started with the CLI -The AusTrakka CLI is a command-line interface for interacting with the AusTrakka platform. -To use it, you will need an AusTrakka account which grants the relevant roles and permissions in any organisation or +The Trakka CLI is a command-line interface for interacting with the Trakka platform. +To use it, you will need a Trakka account which grants the relevant roles and permissions in any organisation or project you wish to interact with. The CLI can be used for several purposes, including: @@ -34,26 +34,26 @@ This will install `trakka` to `~/.local/bin`. You can pass a custom directory li The CLI requires Python to run. If you would like to use conda to install Python, install the CLI, and save the necessary environment variables, you can first install either Miniforge (https://github.com/conda-forge/miniforge) or Miniconda (https://docs.conda.io/en/latest/miniconda.html). We recommend Miniforge for most users. -Note that as a part of installing the CLI, you will need to set the `AT_URI` environment variable. This will be provided by the AusTrakka team. +Note that as a part of installing the CLI, you will need to set the environment's `AT_URI` variable. ### Install into a conda environment (optional but recommended) -If you wish to create a conda environment named `austrakka` with the necessary environment +If you wish to create a conda environment named `trakka` with the necessary environment variables set and the `at-login` alias, run: ``` -conda create -n austrakka python=3.12 -conda activate austrakka -python -m pip install austrakka +conda create -n trakka python=3.12 +conda activate trakka +python -m pip install trakka conda env config vars set AT_URI=[VALUE] mkdir -p ${CONDA_PREFIX}/etc/conda/activate.d -echo "alias at-login=\"export AT_TOKEN=\\\$(austrakka auth user)\"" > ${CONDA_PREFIX}/etc/conda/activate.d/austrakka-alias.sh +echo "alias at-login=\"export AT_TOKEN=\\\$(trakka auth user)\"" > ${CONDA_PREFIX}/etc/conda/activate.d/trakka-alias.sh ``` Note that the last two lines are valid only for Linux/Mac and will not work on Windows. These lines create an alias `at-login` in the conda environment, which will log you in to the CLI. You can then use ``` -conda activate austrakka +conda activate trakka at-login ``` in order to use the CLI. See _User Authentication_ below for alternative login methods. @@ -64,7 +64,7 @@ If you are using Windows, and are not a WSL or Powershell user, it is strongly r To install without conda, simply install with ``` -python -m pip install austrakka +python -m pip install trakka ``` You will need to set the environment variable `AT_URI`. @@ -82,13 +82,13 @@ You can do this by running: >``` To use the CLI, you must log in by setting the `AT_TOKEN` environment variable using the -`austrakka auth user` command (see User Authentication, below). +`trakka auth user` command (see User Authentication, below). > #### Mac / Linux >You may wish to configure >a login command for convenience: >``` ->alias at-login="export AT_TOKEN=\$(austrakka auth user)" +>alias at-login="export AT_TOKEN=\$(trakka auth user)" >``` >You may wish to add this to your `.bashrc` or `.zshrc` file. @@ -96,7 +96,7 @@ To use the CLI, you must log in by setting the `AT_TOKEN` environment variable u >You may wish to configure >a login command for convenience: >``` ->Function at-login { $Env:AT_TOKEN = austrakka auth user } +>Function at-login { $Env:AT_TOKEN = trakka auth user } >``` >You may wish to add this to your `config.ps1` file. @@ -104,17 +104,17 @@ To use the CLI, you must log in by setting the `AT_TOKEN` environment variable u To update to the latest version, run ``` -python -m pip install --upgrade austrakka +python -m pip install --upgrade trakka ``` -If you have installed the CLI into a conda environment, you should first activate it with `conda activate austrakka`: +If you have installed the CLI into a conda environment, you should first activate it with `conda activate trakka`: ``` -conda activate austrakka -python -m pip install --upgrade austrakka +conda activate trakka +python -m pip install --upgrade trakka ``` ## Logging in -Before you can use the CLI, you must log in as described below, to allow the CLI to use your AusTrakka credentials. +Before you can use the CLI, you must log in as described below, to allow the CLI to use your Trakka credentials. Your authorisation will expire after a period and you will need to log in again. ### User Authentication @@ -123,7 +123,7 @@ Most users will want to log in to the CLI this way. For any of these methods, you should be directed to log in via a browser and enter a code to authorise the CLI. This browser-based login uses your institutional credentials, i.e. the same credentials you use to log in -to the AusTrakka web interface, and will authenticate you via your institution's identity provider. +to the Trakka web interface, and will authenticate you via your institution's identity provider. >#### Mac / Linux >If you have configured a login command as described above, you can simply run @@ -133,20 +133,20 @@ to the AusTrakka web interface, and will authenticate you via your institution's > >Otherwise, you will need to set the `AT_TOKEN` environment variable. In a Mac or Linux environment you can run: >``` ->export AT_TOKEN=$(austrakka auth user) +>export AT_TOKEN=$(trakka auth user) >``` >#### Windows: Powershell > >``` ->$Env:AT_TOKEN = austrakka auth user +>$Env:AT_TOKEN = trakka auth user >``` >#### Windows: Cmd > >Set the `AT_TOKEN` environment variable by first running >``` ->austrakka auth user +>trakka auth user >``` >to obtain a token string, and then running >``` @@ -164,24 +164,24 @@ To authenticate a process, you'll need to set the following environment variable AT_AUTH_PROCESS_ID AT_AUTH_PROCESS_SECRET ``` -Values for `AT_AUTH_PROCESS_ID` and `AT_AUTH_PROCESS_SECRET` will be provided to you by the AusTrakka team. Note that the secret value is sensitive. +Values for `AT_AUTH_PROCESS_ID` and `AT_AUTH_PROCESS_SECRET` will be provided to you by the Trakka team. Note that the secret value is sensitive. Once these variables are set, run the following to authorise: >#### Mac/Linux >``` ->export AT_TOKEN=$(austrakka auth process) +>export AT_TOKEN=$(trakka auth process) >``` >#### Windows: Powershell >``` ->$Env:AT_TOKEN = austrakka auth process +>$Env:AT_TOKEN = trakka auth process >``` >#### Windows: Cmd >Set the `AT_TOKEN` environment variable by first running >``` ->austrakka auth process +>trakka auth process >``` >to obtain a token string, and then running >``` @@ -194,19 +194,19 @@ Once these variables are set, run the following to authorise: The CLI has a subcommand structure. Run ``` -austrakka -h +trakka -h ``` to see available subcommands. Run e.g. ``` -austrakka metadata -h +trakka metadata -h ``` to see available commands to manipulate metadata. Run e.g. ``` -austrakka metadata add -h +trakka metadata add -h ``` to see the usage of the `metadata add` command to upload metadata files. @@ -214,13 +214,13 @@ to see the usage of the `metadata add` command to upload metadata files. | Name | Description | |-------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------| -| `AT_TOKEN` | AusTrakka auth token | +| `AT_TOKEN` | Trakka auth token | | `AT_URI` | URI for API endpoint | | `AT_LOG_LEVEL` | Level of logging | | `AT_LOG` | Set to `file` to redirecting logging to a temp file | -| `AT_CMD_SET` | Set to `austrakka-admin` to display admin commands (these will not actually run successfully unless you have an appropriate role on the server) | +| `AT_CMD_SET` | Set to `trakka-admin` to display admin commands (these will not actually run successfully unless you have an appropriate role on the server) | | `AT_TIMEZONE` | Set to change the default timezone used for datetime display and parsing. Default if unset is to use your local timezone. | -| `AT_SKIP_CERT_VERIFY` | Skips verification of the cert used by the AusTrakka backend | +| `AT_SKIP_CERT_VERIFY` | Skips verification of the cert used by the Trakka backend | | `AT_SKIP_VERSION_CHECK` | Skips checking of new CLI version | | `AT_USE_HTTP2` | Uses HTTP2 (experimental) | @@ -228,8 +228,8 @@ All commands require `AT_URI` and `AT_TOKEN` to be set, except for `auth` comman ## Project Structure -Each logical component of the system has its own package under `austrakka/`. Eg. `austrakka/job`. -Components that are children of another component are nested beneath. Eg. `austrakka/job/instance`. +Each logical component of the system has its own package under `trakka/`. Eg. `trakka/job`. +Components that are children of another component are nested beneath. Eg. `trakka/job/instance`. Each component package contains the following files: diff --git a/cxfreeze.py b/cxfreeze.py index 2d0072fe..b9a79d74 100644 --- a/cxfreeze.py +++ b/cxfreeze.py @@ -1,7 +1,7 @@ import os from cx_Freeze import setup -from austrakka import __version__ as VERSION +from trakka import __version__ as VERSION build_dir = os.environ.get("TRAKKA_CLI_BUILD_DIR") @@ -44,5 +44,5 @@ version=VERSION, description="Trakka CLI", options={"build_exe": build_exe_options}, - executables=[{"script": "austrakka/main.py", "base": "console", "target_name": "trakka"}], + executables=[{"script": "trakka/main.py", "base": "console", "target_name": "trakka"}], ) diff --git a/pyproject.toml b/pyproject.toml index 66561440..6ec56e85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,4 @@ [build-system] -name = "austrakka" +name = "trakka" requires = ["setuptools", "wheel"] -build-backend = "setuptools.build_meta:__legacy__" \ No newline at end of file +build-backend = "setuptools.build_meta:__legacy__" diff --git a/scripts/build b/scripts/build index fcdcbabe..e2888d88 100755 --- a/scripts/build +++ b/scripts/build @@ -3,9 +3,6 @@ set -e # This script assumes a python environment is active with required dependencies -# This line can be removed once trakka is made the default name -sed -i.bak "s/\"austrakka\"/\"trakka\"/g" austrakka/__init__.py - if [ -n "$1" ]; then if [[ -d $1 ]]; then WORK_DIR=$1 diff --git a/scripts/release b/scripts/release index 02ba58bd..fc712858 100755 --- a/scripts/release +++ b/scripts/release @@ -15,7 +15,7 @@ fi SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -VERSION=$(grep __version__ "$SCRIPT_DIR/../austrakka/__init__.py" | awk '{print $3}' | sed s/\"//g) +VERSION=$(grep __version__ "$SCRIPT_DIR/../trakka/__init__.py" | awk '{print $3}' | sed s/\"//g) OS=$(uname | awk '{print tolower($0)}') ZIP_NAME=trakka-"$VERSION"-"$OS".zip diff --git a/scripts/setup_trakka.sh b/scripts/setup_trakka.sh index 6232043e..92b3da13 100755 --- a/scripts/setup_trakka.sh +++ b/scripts/setup_trakka.sh @@ -1,21 +1,21 @@ #!/bin/bash -# $1 Replacement name for AusTrakka +# $1 Replacement name for Trakka # Will setup the build environment for publishing to alternative CLI repos. NORMAL=$1 LOWER=$(echo $NORMAL | awk '{print tolower($0)}') -sed -i.bak "s/\"austrakka\"/\"$LOWER\"/g" setup.py -sed -i.bak "s/an AusTrakka instance/a $NORMAL instance/g" setup.py -sed -i.bak "s/austrakka=austrakka.main:main/$LOWER=austrakka.main:main/g" setup.py +sed -i.bak "s/\"trakka\"/\"$LOWER\"/g" setup.py +sed -i.bak "s/an Trakka instance/a $NORMAL instance/g" setup.py +sed -i.bak "s/trakka=trakka.main:main/$LOWER=trakka.main:main/g" setup.py rm setup.py.bak -sed -i.bak "s/\"austrakka\"/\"$LOWER\"/g" pyproject.toml +sed -i.bak "s/\"trakka\"/\"$LOWER\"/g" pyproject.toml rm pyproject.toml.bak -sed -i.bak "s/\"austrakka\"/\"$LOWER\"/g" austrakka/__init__.py -rm austrakka/__init__.py.bak +sed -i.bak "s/\"trakka\"/\"$LOWER\"/g" trakka/__init__.py +rm trakka/__init__.py.bak -sed -i.bak "s/AusTrakka/$NORMAL/g" README.md -sed -i.bak "s/austrakka/$LOWER/g" README.md -sed -i.bak "s/$LOWER-admin/austrakka-admin/g" README.md +sed -i.bak "s/Trakka/$NORMAL/g" README.md +sed -i.bak "s/trakka/$LOWER/g" README.md +sed -i.bak "s/$LOWER-admin/trakka-admin/g" README.md diff --git a/setup.py b/setup.py index 2c6d4d80..66e7aa88 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ # Always prefer setuptools over distutils from setuptools import setup, find_packages from os import path -from austrakka import __version__ as version +from trakka import __version__ as version # io.open is needed for projects that support Python 2.7 # It ensures open() defaults to text mode with universal newlines, @@ -37,7 +37,7 @@ # There are some restrictions on what makes a valid project name # specification here: # https://packaging.python.org/specifications/core-metadata/#name - name="austrakka", # Required + name="trakka", # Required # Versions should comply with PEP 440: # https://www.python.org/dev/peps/pep-0440/ # @@ -48,7 +48,7 @@ # This is a one-line description or tagline of what your project does. This # corresponds to the "Summary" metadata field: # https://packaging.python.org/specifications/core-metadata/#summary - description="A CLI to interact with a AusTrakka instance", # Optional + description="A CLI to interact with a Trakka instance", # Optional # This is an optional longer description of your project that represents # the body of text which users will see when they visit PyPI. # @@ -178,7 +178,7 @@ # executes the function `main` from this package when invoked: # TODO: update this entry_points={ - "console_scripts": ["austrakka=austrakka.main:main"] + "console_scripts": ["trakka=trakka.main:main"] }, # Optional # List additional URLs that are relevant to your project as a dict. # diff --git a/test/conftest.py b/test/conftest.py index 122c7fce..363af5fb 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,8 +1,8 @@ import pathlib -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli import pytest -from austrakka.main import get_cli +from trakka.main import get_cli def pytest_collection_modifyitems(config, items): @@ -34,8 +34,8 @@ def pytest_configure(config): @pytest.fixture() -def austrakka_test_cli(): +def trakka_test_cli(): """ - Access the AusTrakka CLI in a test. + Access the Trakka CLI in a test. """ - return AusTrakkaTestCli(get_cli()) + return TrakkaTestCli(get_cli()) diff --git a/test/end_to_end_tests/ete_cmd_bricks.py b/test/end_to_end_tests/ete_cmd_bricks.py index 0e6d7787..3891ec06 100644 --- a/test/end_to_end_tests/ete_cmd_bricks.py +++ b/test/end_to_end_tests/ete_cmd_bricks.py @@ -4,10 +4,10 @@ from click.testing import CliRunner from ete_utils import _save_to_test_dir, _create_single_seq_csv, _new_identifier, _create_paired_seq_csv from ete_constants import seq_id_field_name -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli -def _sample_unshare(cli: AusTrakkaTestCli, seq_id: str, group_name: str): +def _sample_unshare(cli: TrakkaTestCli, seq_id: str, group_name: str): result = cli.invoke([ 'sample', 'unshare', @@ -19,7 +19,7 @@ def _sample_unshare(cli: AusTrakkaTestCli, seq_id: str, group_name: str): def _seq_sync_get( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, group: str, output_dir: str, seq_type: str, @@ -46,7 +46,7 @@ def _seq_sync_get( def _upload_fastq_ill_se_file( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, seq_id: str, fastq_file_path: str, owner_org: str, @@ -87,7 +87,7 @@ def _upload_fastq_ill_se_file( def _upload_fastq_ill_pe_file( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, seq_id: str, fastq_file_path1: str, fastq_file_path2: str, @@ -129,7 +129,7 @@ def _upload_fastq_ill_pe_file( def _upload_fasta_asm_file( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, fasta_file_path: str, seq_id: str, owner_org: str, @@ -168,7 +168,7 @@ def _upload_fasta_asm_file( def _upload_fasta_cns_file( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, fasta_file_path: str, owner_org: str, shared_projects: list[str] = None, @@ -203,7 +203,7 @@ def _upload_fasta_cns_file( def _upload_min_metadata( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, proforma: str, seq_ids: list[str], owner_org: str, @@ -232,7 +232,7 @@ def _upload_min_metadata( def _create_csv_content(seq_ids) -> str: return f'{seq_id_field_name}\n' + "\n".join(seq_ids) + "\n" -def _create_project(cli: AusTrakkaTestCli, name: str): +def _create_project(cli: TrakkaTestCli, name: str): result = cli.invoke([ 'project', 'add', @@ -246,7 +246,7 @@ def _create_project(cli: AusTrakkaTestCli, name: str): assert result.exit_code == 0, f'Failed to create project {name} as part of test setup: {result.output}' -def _create_group(cli: AusTrakkaTestCli, name: str): +def _create_group(cli: TrakkaTestCli, name: str): result = cli.invoke([ 'group', 'add', @@ -259,7 +259,7 @@ def _create_group(cli: AusTrakkaTestCli, name: str): def _create_proforma( - cli: AusTrakkaTestCli, + cli: TrakkaTestCli, name: str, required_fields: list[str] = None, optional_fields: list[str] = None): @@ -292,7 +292,7 @@ def _create_proforma( assert result.exit_code == 0, f'Failed to create proforma {name}: {result.output}' -def _create_field_if_not_exists(cli: AusTrakkaTestCli, field_name): +def _create_field_if_not_exists(cli: TrakkaTestCli, field_name): result = cli.invoke([ 'field', 'list', @@ -315,7 +315,7 @@ def _create_field_if_not_exists(cli: AusTrakkaTestCli, field_name): assert result.exit_code == 0, f'Failed to create field {field_name} as part of test setup: {result.output}' -def _create_org(cli: AusTrakkaTestCli, name: str): +def _create_org(cli: TrakkaTestCli, name: str): result = cli.invoke([ 'org', 'add', @@ -328,7 +328,7 @@ def _create_org(cli: AusTrakkaTestCli, name: str): assert result.exit_code == 0, f'Failed to create org {name} as part of test setup: {result.output}' -def _list_seq_by_group(cli: AusTrakkaTestCli, group: str): +def _list_seq_by_group(cli: TrakkaTestCli, group: str): result = cli.invoke([ 'seq', 'list', diff --git a/test/end_to_end_tests/test_proforma_commands.py b/test/end_to_end_tests/test_proforma_commands.py index 3115c555..b67e5213 100644 --- a/test/end_to_end_tests/test_proforma_commands.py +++ b/test/end_to_end_tests/test_proforma_commands.py @@ -4,13 +4,13 @@ from ete_cmd_bricks import _create_proforma, _create_field_if_not_exists from ete_utils import _new_identifier -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestProformaCommands: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def _get_proforma_fields(self, proforma_name: str): result: Result = self.cli.invoke([ @@ -246,4 +246,4 @@ def test_add_version_should_warn_when_removing_non_existent_field(self): # Assert assert result.exit_code == 0 - assert f"Field '{non_existent_field}' specified for removal was not found" in result.output \ No newline at end of file + assert f"Field '{non_existent_field}' specified for removal was not found" in result.output diff --git a/test/end_to_end_tests/test_role_remove_command.py b/test/end_to_end_tests/test_role_remove_command.py index 742c77fb..8a406aba 100644 --- a/test/end_to_end_tests/test_role_remove_command.py +++ b/test/end_to_end_tests/test_role_remove_command.py @@ -1,13 +1,13 @@ import pytest from ete_utils import _new_identifier -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestRoleRemoveCommand: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def test_role_remove__given_role_exists_and_not_in_use__expect_success(self): # Arrange @@ -31,7 +31,7 @@ def test_role_remove__given_role_exists_and_not_in_use__expect_success(self): assert not _role_exists(self.cli, role_name), f'Role {role_name} should not exist after removal' -def _create_role(cli: AusTrakkaTestCli, role_name: str): +def _create_role(cli: TrakkaTestCli, role_name: str): """Create a role for testing purposes""" result = cli.invoke([ 'iam', @@ -46,7 +46,7 @@ def _create_role(cli: AusTrakkaTestCli, role_name: str): assert result.exit_code == 0, f'Failed to create role {role_name} as part of test setup: {result.output}' -def _role_exists(cli: AusTrakkaTestCli, role_name: str) -> bool: +def _role_exists(cli: TrakkaTestCli, role_name: str) -> bool: """Check if a role exists by attempting to list roles and parsing output""" result = cli.invoke([ 'iam', diff --git a/test/end_to_end_tests/test_seq_add_commands.py b/test/end_to_end_tests/test_seq_add_commands.py index d6986f66..6f728c84 100644 --- a/test/end_to_end_tests/test_seq_add_commands.py +++ b/test/end_to_end_tests/test_seq_add_commands.py @@ -7,12 +7,12 @@ _upload_fasta_asm_file, _upload_min_metadata) from ete_utils import _new_identifier -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestSeqAddCommands: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def test_seq_add_fasta_asm__given_sample_has_no_prior_asm_sequences__expect_success_without_needing_skip_or_force(self): diff --git a/test/end_to_end_tests/test_seq_get_command.py b/test/end_to_end_tests/test_seq_get_command.py index b40822b1..59c5fd7a 100644 --- a/test/end_to_end_tests/test_seq_get_command.py +++ b/test/end_to_end_tests/test_seq_get_command.py @@ -16,7 +16,7 @@ _mk_temp_dir, _clone_cns_fasta_file) -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestSeqGetCommand: @@ -30,8 +30,8 @@ class TestSeqGetCommand: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def test_get__given_both_seq_id_and_group_are_not_specified__expect_cli_error(self): # Arrange @@ -437,4 +437,4 @@ def _assert_single_file_downloads_exists(self, seq_ids: list[str], seq_type, tem # If you need to work with the actual file(s) that match the pattern: for file_path in matching_files: # Do something with each matching file - assert os.path.exists(file_path) is True \ No newline at end of file + assert os.path.exists(file_path) is True diff --git a/test/end_to_end_tests/test_seq_list_command.py b/test/end_to_end_tests/test_seq_list_command.py index d5b5e4b6..4571f268 100644 --- a/test/end_to_end_tests/test_seq_list_command.py +++ b/test/end_to_end_tests/test_seq_list_command.py @@ -11,13 +11,13 @@ _new_identifier, seq_id_field_name, _clone_cns_fasta_file) -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestSeqGetCommand: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def test_list__given_group_name_and_seq_id_are_not_specified__expect_cli_error(self): diff --git a/test/end_to_end_tests/test_seq_purge_command.py b/test/end_to_end_tests/test_seq_purge_command.py index 7b93ad99..65a69e38 100644 --- a/test/end_to_end_tests/test_seq_purge_command.py +++ b/test/end_to_end_tests/test_seq_purge_command.py @@ -12,13 +12,13 @@ seq_id_field_name, _clone_cns_fasta_file) -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestSeqPurgeCommand: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def test_purge__given_seq_type_not_specified__expect_cli_error(self): # Arrange @@ -229,4 +229,4 @@ def test_purge__given_sample_has_sequences_of_the_type_in_the_purge_request__exp # _upload_fasta_cns_file(self.cli, cns_fasta_path, org_name) pre_purge_list2 = _list_seq_by_group(self.cli, owner_group) assert sum(1 for entry in pre_purge_list2 if entry.get('sampleName') == seq_id) == 0, pre_purge_list2 - assert sum(1 for entry in pre_purge_list2 if entry.get('sampleName') == seq_id2) == 1, pre_purge_list2 \ No newline at end of file + assert sum(1 for entry in pre_purge_list2 if entry.get('sampleName') == seq_id2) == 1, pre_purge_list2 diff --git a/test/end_to_end_tests/test_seq_sync_get_commands.py b/test/end_to_end_tests/test_seq_sync_get_commands.py index 8b511a51..8b705665 100644 --- a/test/end_to_end_tests/test_seq_sync_get_commands.py +++ b/test/end_to_end_tests/test_seq_sync_get_commands.py @@ -25,13 +25,13 @@ _calc_hash, _undo_fasta_asm_transform, _textwrap, _read_cns_to_set, _get_single_seq_file_path) -from test.utils.austrakka_test_cli import AusTrakkaTestCli +from test.utils.trakka_test_cli import TrakkaTestCli class TestSeqSyncGetCommands: @pytest.fixture(autouse=True) - def _use_cli(self, austrakka_test_cli: AusTrakkaTestCli): - self.cli = austrakka_test_cli + def _use_cli(self, trakka_test_cli: TrakkaTestCli): + self.cli = trakka_test_cli def test_sync_get__given_consensus_fasta_with_multi_sequences_is_uploaded_and_then_syncd_to_disk__expect_all_sequences_are_also_merged_into_a_single_file(self): # Arrange diff --git a/test/unit_tests/components/sequence/sync/test_state_machine.py b/test/unit_tests/components/sequence/sync/test_state_machine.py index efce75df..2ebd82e6 100644 --- a/test/unit_tests/components/sequence/sync/test_state_machine.py +++ b/test/unit_tests/components/sequence/sync/test_state_machine.py @@ -1,7 +1,7 @@ import pytest -from austrakka.components.sequence.sync.sync_workflow import configure_state_machine -from austrakka.components.sequence.sync.state_machine import * +from trakka.components.sequence.sync.sync_workflow import configure_state_machine +from trakka.components.sequence.sync.state_machine import * class TestStateMachine: diff --git a/test/unit_tests/components/sequence/sync/test_sync_workflow.py b/test/unit_tests/components/sequence/sync/test_sync_workflow.py index f5889f3b..b2583d49 100644 --- a/test/unit_tests/components/sequence/sync/test_sync_workflow.py +++ b/test/unit_tests/components/sequence/sync/test_sync_workflow.py @@ -5,13 +5,13 @@ from datetime import datetime -from austrakka.components.sequence.sync.sync_workflow import analyse -from austrakka.components.sequence.sync.sync_workflow import finalise -from austrakka.components.sequence.sync.sync_workflow import purge -from austrakka.components.sequence.sync.state_machine import SName -from austrakka.components.sequence.sync.state_machine import Action -from austrakka.components.sequence.sync.constant import * -from austrakka.utils.enums.seq import SeqType +from trakka.components.sequence.sync.sync_workflow import analyse +from trakka.components.sequence.sync.sync_workflow import finalise +from trakka.components.sequence.sync.sync_workflow import purge +from trakka.components.sequence.sync.state_machine import SName +from trakka.components.sequence.sync.state_machine import Action +from trakka.components.sequence.sync.constant import * +from trakka.utils.enums.seq import SeqType from test.end_to_end_tests.ete_utils import _mk_temp_dir # Test constants diff --git a/test/utils/austrakka_test_cli.py b/test/utils/trakka_test_cli.py similarity index 60% rename from test/utils/austrakka_test_cli.py rename to test/utils/trakka_test_cli.py index 68367858..498ab9aa 100644 --- a/test/utils/austrakka_test_cli.py +++ b/test/utils/trakka_test_cli.py @@ -3,42 +3,42 @@ from click.testing import CliRunner, Result -from austrakka.utils.context import CxtKey -from austrakka.utils.context import AusTrakkaCxt -from austrakka.utils.misc import AusTrakkaCliTopLevel +from trakka.utils.context import CxtKey +from trakka.utils.context import TrakkaCxt +from trakka.utils.misc import TrakkaCliTopLevel from test.utils.exceptions import CliTestException PRODLIKE_DOMAIN = "austrakka.net" -class AusTrakkaTestCli: +class TrakkaTestCli: """ - A wrapper class around click.testing.CliRunner for invoking the AusTrakka + A wrapper class around click.testing.CliRunner for invoking the Trakka CLI. """ - def __init__(self, austrakka_cli: AusTrakkaCliTopLevel): - self._austrakka_cli = austrakka_cli + def __init__(self, trakka_cli: TrakkaCliTopLevel): + self._trakka_cli = trakka_cli self._runner = CliRunner() self._validate() def _validate(self) -> None: """ - Ensures that a valid test AusTrakka CLI can be created + Ensures that a valid test Trakka CLI can be created :raises CliTestException: there is a problem with the provided config """ - at_uri = os.getenv(AusTrakkaCxt.get_env_var_name(CxtKey.URI), '') + at_uri = os.getenv(TrakkaCxt.get_env_var_name(CxtKey.URI), '') if PRODLIKE_DOMAIN in at_uri: raise CliTestException(f"Unable to run tests against {at_uri}") def invoke(self, args: List[str]) -> Result: """ - Invoke the AusTrakka CLI + Invoke the Trakka CLI :param args: verbatim subcommands, options and arguments for the CLI :return: result of invoking the command """ print("Invoking CLI", args) - return self._runner.invoke(self._austrakka_cli, args) + return self._runner.invoke(self._trakka_cli, args) diff --git a/austrakka/__init__.py b/trakka/__init__.py similarity index 82% rename from austrakka/__init__.py rename to trakka/__init__.py index d2c51ebf..73261af1 100644 --- a/austrakka/__init__.py +++ b/trakka/__init__.py @@ -1,4 +1,4 @@ # NOTE: do not change the name of this variable or the quote type, # doing so will break github actions. __version__ = "0.84.0" -__prog_name__ = "austrakka" +__prog_name__ = "trakka" diff --git a/austrakka/components/__init__.py b/trakka/components/__init__.py similarity index 100% rename from austrakka/components/__init__.py rename to trakka/components/__init__.py diff --git a/austrakka/components/admin/__init__.py b/trakka/components/admin/__init__.py similarity index 65% rename from austrakka/components/admin/__init__.py rename to trakka/components/admin/__init__.py index ac55b96b..7b12401d 100644 --- a/austrakka/components/admin/__init__.py +++ b/trakka/components/admin/__init__.py @@ -1,9 +1,9 @@ # pylint: disable=expression-not-assigned import click -from austrakka.components.admin.message import message -from austrakka.components.admin.rawlog import rawlog -from austrakka.utils.cmd_filter import show_admin_cmds +from trakka.components.admin.message import message +from trakka.components.admin.rawlog import rawlog +from trakka.utils.cmd_filter import show_admin_cmds @click.group('admin') diff --git a/austrakka/components/admin/message/__init__.py b/trakka/components/admin/message/__init__.py similarity index 64% rename from austrakka/components/admin/message/__init__.py rename to trakka/components/admin/message/__init__.py index c669a2f0..5ae0f771 100644 --- a/austrakka/components/admin/message/__init__.py +++ b/trakka/components/admin/message/__init__.py @@ -1,17 +1,17 @@ from io import BufferedReader import click -from austrakka.components.admin.message.feedback import feedback -from austrakka.components.admin.message.dl import dead_letter -from austrakka.components.admin.message.funcs import add_message -from austrakka.components.admin.message.funcs import metrics_message -from austrakka.components.admin.message.funcs import show_message -from austrakka.components.admin.message.funcs import list_message -from austrakka.components.admin.message.funcs import opt_queue_name -from austrakka.components.admin.message.funcs import opt_msg_id -from austrakka.utils.cmd_filter import show_admin_cmds -from austrakka.utils.output import table_format_option -from austrakka.utils.output import object_format_option +from trakka.components.admin.message.feedback import feedback +from trakka.components.admin.message.dl import dead_letter +from trakka.components.admin.message.funcs import add_message +from trakka.components.admin.message.funcs import metrics_message +from trakka.components.admin.message.funcs import show_message +from trakka.components.admin.message.funcs import list_message +from trakka.components.admin.message.funcs import opt_queue_name +from trakka.components.admin.message.funcs import opt_msg_id +from trakka.utils.cmd_filter import show_admin_cmds +from trakka.utils.output import table_format_option +from trakka.utils.output import object_format_option @click.group() diff --git a/austrakka/components/admin/message/dl/__init__.py b/trakka/components/admin/message/dl/__init__.py similarity index 67% rename from austrakka/components/admin/message/dl/__init__.py rename to trakka/components/admin/message/dl/__init__.py index 72b0898b..2e589ec1 100644 --- a/austrakka/components/admin/message/dl/__init__.py +++ b/trakka/components/admin/message/dl/__init__.py @@ -1,14 +1,14 @@ import click -from austrakka.components.admin.message.dl.funcs import delete_dl -from austrakka.components.admin.message.dl.funcs import list_dl -from austrakka.components.admin.message.dl.funcs import resend_dl -from austrakka.components.admin.message.dl.funcs import show_dl -from austrakka.components.admin.message.dl.funcs import summary_dl -from austrakka.components.admin.message.funcs import opt_msg_id -from austrakka.components.admin.message.funcs import opt_queue_name -from austrakka.utils.output import table_format_option -from austrakka.utils.output import object_format_option +from trakka.components.admin.message.dl.funcs import delete_dl +from trakka.components.admin.message.dl.funcs import list_dl +from trakka.components.admin.message.dl.funcs import resend_dl +from trakka.components.admin.message.dl.funcs import show_dl +from trakka.components.admin.message.dl.funcs import summary_dl +from trakka.components.admin.message.funcs import opt_msg_id +from trakka.components.admin.message.funcs import opt_queue_name +from trakka.utils.output import table_format_option +from trakka.utils.output import object_format_option @click.group('dl') @click.pass_context diff --git a/austrakka/components/admin/message/dl/funcs.py b/trakka/components/admin/message/dl/funcs.py similarity index 81% rename from austrakka/components/admin/message/dl/funcs.py rename to trakka/components/admin/message/dl/funcs.py index b16d3284..3748c495 100644 --- a/austrakka/components/admin/message/dl/funcs.py +++ b/trakka/components/admin/message/dl/funcs.py @@ -1,7 +1,7 @@ -from austrakka.utils.api import api_delete, api_patch -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.paths import MESSAGES_PATH +from trakka.utils.api import api_delete, api_patch +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.paths import MESSAGES_PATH def show_dl(queue_name: str, msg_id: int, out_format: str): diff --git a/austrakka/components/admin/message/feedback/__init__.py b/trakka/components/admin/message/feedback/__init__.py similarity index 62% rename from austrakka/components/admin/message/feedback/__init__.py rename to trakka/components/admin/message/feedback/__init__.py index 227e920f..e3a208f1 100644 --- a/austrakka/components/admin/message/feedback/__init__.py +++ b/trakka/components/admin/message/feedback/__init__.py @@ -1,11 +1,11 @@ import click -from austrakka.components.admin.message.feedback.funcs import delete_feedback -from austrakka.components.admin.message.feedback.funcs import list_feedback -from austrakka.components.admin.message.feedback.funcs import show_feedback -from austrakka.components.admin.message.funcs import opt_msg_id -from austrakka.components.admin.message.funcs import opt_queue_name -from austrakka.utils.output import object_format_option +from trakka.components.admin.message.feedback.funcs import delete_feedback +from trakka.components.admin.message.feedback.funcs import list_feedback +from trakka.components.admin.message.feedback.funcs import show_feedback +from trakka.components.admin.message.funcs import opt_msg_id +from trakka.components.admin.message.funcs import opt_queue_name +from trakka.utils.output import object_format_option @click.group('feedback') @click.pass_context diff --git a/austrakka/components/admin/message/feedback/funcs.py b/trakka/components/admin/message/feedback/funcs.py similarity index 71% rename from austrakka/components/admin/message/feedback/funcs.py rename to trakka/components/admin/message/feedback/funcs.py index 9a50a141..3b2f33d5 100644 --- a/austrakka/components/admin/message/feedback/funcs.py +++ b/trakka/components/admin/message/feedback/funcs.py @@ -1,6 +1,6 @@ -from austrakka.utils.api import api_delete -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.paths import MESSAGES_PATH +from trakka.utils.api import api_delete +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.paths import MESSAGES_PATH def show_feedback(msg_id: int, out_format: str): diff --git a/austrakka/components/admin/message/funcs.py b/trakka/components/admin/message/funcs.py similarity index 84% rename from austrakka/components/admin/message/funcs.py rename to trakka/components/admin/message/funcs.py index 70a88d1c..2942794b 100644 --- a/austrakka/components/admin/message/funcs.py +++ b/trakka/components/admin/message/funcs.py @@ -4,10 +4,10 @@ import click -from austrakka.utils.api import api_patch -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.option_utils import create_option -from austrakka.utils.paths import MESSAGES_PATH +from trakka.utils.api import api_patch +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.option_utils import create_option +from trakka.utils.paths import MESSAGES_PATH def opt_queue_name(**attrs: t.Any): defaults = { diff --git a/austrakka/components/admin/rawlog/__init__.py b/trakka/components/admin/rawlog/__init__.py similarity index 90% rename from austrakka/components/admin/rawlog/__init__.py rename to trakka/components/admin/rawlog/__init__.py index f0c9777f..43c80230 100644 --- a/austrakka/components/admin/rawlog/__init__.py +++ b/trakka/components/admin/rawlog/__init__.py @@ -1,9 +1,9 @@ import click -from austrakka.utils.options import opt_identifier, opt_view_type -from austrakka.utils.output import object_format_option, table_format_option -from austrakka.utils.option_utils import create_option -from austrakka.components.admin.rawlog.funcs import \ +from trakka.utils.options import opt_identifier, opt_view_type +from trakka.utils.output import object_format_option, table_format_option +from trakka.utils.option_utils import create_option +from trakka.components.admin.rawlog.funcs import \ show_raw_log, list_raw_logs, regenerate_raw_log, regenerate_raw_log_bulk def opt_spec_filter(): diff --git a/austrakka/components/admin/rawlog/funcs.py b/trakka/components/admin/rawlog/funcs.py similarity index 89% rename from austrakka/components/admin/rawlog/funcs.py rename to trakka/components/admin/rawlog/funcs.py index ffa674aa..d46797d8 100644 --- a/austrakka/components/admin/rawlog/funcs.py +++ b/trakka/components/admin/rawlog/funcs.py @@ -1,12 +1,12 @@ from loguru import logger -from austrakka.utils.datetimes import dt_parse -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.api import api_post, api_get -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import get_viewtype_columns -from austrakka.utils.paths import TENANT_PATH +from trakka.utils.datetimes import dt_parse +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.api import api_post, api_get +from trakka.utils.misc import logger_wraps +from trakka.utils.output import get_viewtype_columns +from trakka.utils.paths import TENANT_PATH @logger_wraps() def show_raw_log(global_id: str, out_format: str): diff --git a/austrakka/components/auth/__init__.py b/trakka/components/auth/__init__.py similarity index 100% rename from austrakka/components/auth/__init__.py rename to trakka/components/auth/__init__.py diff --git a/austrakka/components/auth/enums.py b/trakka/components/auth/enums.py similarity index 100% rename from austrakka/components/auth/enums.py rename to trakka/components/auth/enums.py diff --git a/austrakka/components/auth/funcs.py b/trakka/components/auth/funcs.py similarity index 86% rename from austrakka/components/auth/funcs.py rename to trakka/components/auth/funcs.py index 94b27c1f..f612923a 100644 --- a/austrakka/components/auth/funcs.py +++ b/trakka/components/auth/funcs.py @@ -5,9 +5,9 @@ from azure.identity import DeviceCodeCredential from loguru import logger -from austrakka.utils.config import get_server_info_or_create -from austrakka.utils.context import CxtKey -from austrakka.utils.context import AusTrakkaCxt +from trakka.utils.config import get_server_info_or_create +from trakka.utils.context import CxtKey +from trakka.utils.context import TrakkaCxt def _get_api_scope(app_uri): @@ -20,8 +20,8 @@ def user_login( app_uri: str, ): server_info = get_server_info_or_create( - AusTrakkaCxt.get_value(CxtKey.URI), - AusTrakkaCxt.get_value(CxtKey.SKIP_CERT_VERIFY), + TrakkaCxt.get_value(CxtKey.URI), + TrakkaCxt.get_value(CxtKey.SKIP_CERT_VERIFY), ) if server_info is not None: (client_id, tenant_id, app_uri) = server_info @@ -55,8 +55,8 @@ def process_login( client_secret: str ): server_info = get_server_info_or_create( - AusTrakkaCxt.get_value(CxtKey.URI), - AusTrakkaCxt.get_value(CxtKey.SKIP_CERT_VERIFY), + TrakkaCxt.get_value(CxtKey.URI), + TrakkaCxt.get_value(CxtKey.SKIP_CERT_VERIFY), ) if server_info is not None: (_, tenant_id, app_uri) = server_info diff --git a/austrakka/components/auth/opts.py b/trakka/components/auth/opts.py similarity index 95% rename from austrakka/components/auth/opts.py rename to trakka/components/auth/opts.py index f73793ff..7738f5d7 100644 --- a/austrakka/components/auth/opts.py +++ b/trakka/components/auth/opts.py @@ -1,5 +1,5 @@ import click -from austrakka.components.auth.enums import Auth +from trakka.components.auth.enums import Auth def opt_tenant_id(func): diff --git a/austrakka/components/dashboard/__init__.py b/trakka/components/dashboard/__init__.py similarity index 69% rename from austrakka/components/dashboard/__init__.py rename to trakka/components/dashboard/__init__.py index 7e936329..28864df7 100644 --- a/austrakka/components/dashboard/__init__.py +++ b/trakka/components/dashboard/__init__.py @@ -1,8 +1,8 @@ # pylint: disable=expression-not-assigned import click -from austrakka.components.dashboard.project import project -from austrakka.utils.cmd_filter import show_admin_cmds +from trakka.components.dashboard.project import project +from trakka.utils.cmd_filter import show_admin_cmds @click.group() diff --git a/austrakka/components/dashboard/project/__init__.py b/trakka/components/dashboard/project/__init__.py similarity index 75% rename from austrakka/components/dashboard/project/__init__.py rename to trakka/components/dashboard/project/__init__.py index f5d8605e..4e20ce08 100644 --- a/austrakka/components/dashboard/project/__init__.py +++ b/trakka/components/dashboard/project/__init__.py @@ -1,11 +1,11 @@ import click -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.components.dashboard.project.funcs import add_dashboard -from austrakka.components.dashboard.project.funcs import update_dashboard -from austrakka.components.dashboard.project.funcs import list_dashboards -from austrakka.components.dashboard.project.funcs import rename_dashboard +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.components.dashboard.project.funcs import add_dashboard +from trakka.components.dashboard.project.funcs import update_dashboard +from trakka.components.dashboard.project.funcs import list_dashboards +from trakka.components.dashboard.project.funcs import rename_dashboard from ....utils.options import * diff --git a/austrakka/components/dashboard/project/funcs.py b/trakka/components/dashboard/project/funcs.py similarity index 76% rename from austrakka/components/dashboard/project/funcs.py rename to trakka/components/dashboard/project/funcs.py index 97bb27e9..194473a4 100644 --- a/austrakka/components/dashboard/project/funcs.py +++ b/trakka/components/dashboard/project/funcs.py @@ -1,9 +1,9 @@ -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.api import api_post -from austrakka.utils.api import api_put -from austrakka.utils.api import api_patch -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import PROJECT_DASHBOARD_PATH +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.api import api_post +from trakka.utils.api import api_put +from trakka.utils.api import api_patch +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import PROJECT_DASHBOARD_PATH RENAME = 'rename' diff --git a/austrakka/components/field/__init__.py b/trakka/components/field/__init__.py similarity index 97% rename from austrakka/components/field/__init__.py rename to trakka/components/field/__init__.py index 1c6825f4..5e95346d 100644 --- a/austrakka/components/field/__init__.py +++ b/trakka/components/field/__init__.py @@ -1,7 +1,7 @@ import click -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds from .funcs import list_fields, add_field, update_field, disable_field, enable_field, \ list_field_groups, list_field_projects, list_field_proformas from ...utils.options import * diff --git a/austrakka/components/field/funcs.py b/trakka/components/field/funcs.py similarity index 90% rename from austrakka/components/field/funcs.py rename to trakka/components/field/funcs.py index 996b80e6..6973ecaa 100644 --- a/austrakka/components/field/funcs.py +++ b/trakka/components/field/funcs.py @@ -2,13 +2,13 @@ from loguru import logger -from austrakka.utils.api import api_get -from austrakka.utils.api import api_post -from austrakka.utils.api import api_patch -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dataframe, get_viewtype_columns -from austrakka.utils.paths import METADATA_COLUMN_V2_PATH +from trakka.utils.api import api_get +from trakka.utils.api import api_post +from trakka.utils.api import api_patch +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dataframe, get_viewtype_columns +from trakka.utils.paths import METADATA_COLUMN_V2_PATH list_compact_fields = ['columnName', 'metaDataColumnTypeName', 'metaDataColumnValidValues'] @@ -24,7 +24,7 @@ @logger_wraps() def list_fields(view_type: str, out_format: str): """ - List all metadata fields (MetaDataColumns) within AusTrakka. + List all metadata fields """ response = api_get( path=f"{METADATA_COLUMN_V2_PATH}", @@ -61,7 +61,7 @@ def add_field( examples: str, ): """ - Add a field (MetaDataColumn) to AusTrakka. + Add a field """ if can_visualise and typename in ["date", "number", "string"]: logger.warning( @@ -109,7 +109,7 @@ def update_field( is_private: bool, ): """ - Update a field (MetaDataColumn) within AusTrakka. + Update a field name specifies the name of the field to modify. All other parameters are optional, and their corresponding values will only be updated if they are specified. @@ -200,7 +200,7 @@ def list_field_proformas(name: str, out_format: str): @logger_wraps() def disable_field(name: str): """ - Disable a field (MetaDataColumn) within AusTrakka. + Disable a field """ api_patch( path=f"{METADATA_COLUMN_V2_PATH}/{name}/disable" @@ -210,7 +210,7 @@ def disable_field(name: str): @logger_wraps() def enable_field(name: str): """ - Enable a field (MetaDataColumn) within AusTrakka. + Enable a field """ api_patch( path=f"{METADATA_COLUMN_V2_PATH}/{name}/enable" diff --git a/austrakka/components/fieldtype/__init__.py b/trakka/components/fieldtype/__init__.py similarity index 64% rename from austrakka/components/fieldtype/__init__.py rename to trakka/components/fieldtype/__init__.py index f9b8417e..de3c286c 100644 --- a/austrakka/components/fieldtype/__init__.py +++ b/trakka/components/fieldtype/__init__.py @@ -2,17 +2,17 @@ import click -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.output import table_format_option -from austrakka.components.fieldtype.funcs import list_fieldtypes -from austrakka.components.fieldtype.funcs import add_fieldtype -from austrakka.components.fieldtype.funcs import update_fieldtype -from austrakka.components.fieldtype.value import value -from austrakka.utils.options import opt_description -from austrakka.utils.options import opt_name -from austrakka.utils.options import opt_fieldtype_value -from austrakka.utils.options import opt_is_active -from austrakka.utils.cmd_filter import show_admin_cmds +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.output import table_format_option +from trakka.components.fieldtype.funcs import list_fieldtypes +from trakka.components.fieldtype.funcs import add_fieldtype +from trakka.components.fieldtype.funcs import update_fieldtype +from trakka.components.fieldtype.value import value +from trakka.utils.options import opt_description +from trakka.utils.options import opt_name +from trakka.utils.options import opt_fieldtype_value +from trakka.utils.options import opt_is_active +from trakka.utils.cmd_filter import show_admin_cmds @click.group() diff --git a/austrakka/components/fieldtype/funcs.py b/trakka/components/fieldtype/funcs.py similarity index 73% rename from austrakka/components/fieldtype/funcs.py rename to trakka/components/fieldtype/funcs.py index e6ab0342..b5611d5b 100644 --- a/austrakka/components/fieldtype/funcs.py +++ b/trakka/components/fieldtype/funcs.py @@ -1,12 +1,12 @@ from typing import List -from austrakka.utils.api import api_get -from austrakka.utils.api import api_post -from austrakka.utils.api import api_put -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dict -from austrakka.utils.paths import METADATA_COLUMN_TYPE_V2_PATH -from austrakka.utils.helpers.fieldtype import get_fieldtype_by_name_v2 +from trakka.utils.api import api_get +from trakka.utils.api import api_post +from trakka.utils.api import api_put +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dict +from trakka.utils.paths import METADATA_COLUMN_TYPE_V2_PATH +from trakka.utils.helpers.fieldtype import get_fieldtype_by_name_v2 @logger_wraps() @@ -29,7 +29,7 @@ def add_fieldtype( valid_values: List[str], ): """ - Add a categorical fieldtype (MetaDataColumnType) and its valid values to AusTrakka. + Add a categorical fieldtype and its valid values """ api_post( path=f"{METADATA_COLUMN_TYPE_V2_PATH}", diff --git a/austrakka/components/fieldtype/value/__init__.py b/trakka/components/fieldtype/value/__init__.py similarity index 73% rename from austrakka/components/fieldtype/value/__init__.py rename to trakka/components/fieldtype/value/__init__.py index 38400461..70caee10 100644 --- a/austrakka/components/fieldtype/value/__init__.py +++ b/trakka/components/fieldtype/value/__init__.py @@ -2,10 +2,10 @@ import click -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.components.fieldtype.value.funcs import add_fieldtype_values -from austrakka.components.fieldtype.value.funcs import remove_fieldtype_values -from austrakka.utils.options import opt_fieldtype_value +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.components.fieldtype.value.funcs import add_fieldtype_values +from trakka.components.fieldtype.value.funcs import remove_fieldtype_values +from trakka.utils.options import opt_fieldtype_value @click.group() diff --git a/austrakka/components/fieldtype/value/funcs.py b/trakka/components/fieldtype/value/funcs.py similarity index 74% rename from austrakka/components/fieldtype/value/funcs.py rename to trakka/components/fieldtype/value/funcs.py index 4e27d015..13525215 100644 --- a/austrakka/components/fieldtype/value/funcs.py +++ b/trakka/components/fieldtype/value/funcs.py @@ -1,8 +1,8 @@ from typing import List -from austrakka.utils.api import api_post -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import METADATA_COLUMN_TYPE_V2_PATH +from trakka.utils.api import api_post +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import METADATA_COLUMN_TYPE_V2_PATH @logger_wraps() diff --git a/austrakka/components/group/__init__.py b/trakka/components/group/__init__.py similarity index 68% rename from austrakka/components/group/__init__.py rename to trakka/components/group/__init__.py index 01cda44e..ab1d4042 100644 --- a/austrakka/components/group/__init__.py +++ b/trakka/components/group/__init__.py @@ -1,15 +1,15 @@ # pylint: disable=expression-not-assigned import click -from austrakka.components.group.field import field -from austrakka.components.group.funcs import add_group -from austrakka.components.group.funcs import list_group -from austrakka.components.group.funcs import update_group -from austrakka.components.group.role import role -from austrakka.utils.cmd_filter import hide_admin_cmds, show_admin_cmds -from austrakka.utils.options import opt_name -from austrakka.utils.options import opt_organisation -from austrakka.utils.output import table_format_option +from trakka.components.group.field import field +from trakka.components.group.funcs import add_group +from trakka.components.group.funcs import list_group +from trakka.components.group.funcs import update_group +from trakka.components.group.role import role +from trakka.utils.cmd_filter import hide_admin_cmds, show_admin_cmds +from trakka.utils.options import opt_name +from trakka.utils.options import opt_organisation +from trakka.utils.output import table_format_option @click.group() diff --git a/austrakka/components/group/field/__init__.py b/trakka/components/group/field/__init__.py similarity index 87% rename from austrakka/components/group/field/__init__.py rename to trakka/components/group/field/__init__.py index ffb77612..a85b621b 100644 --- a/austrakka/components/group/field/__init__.py +++ b/trakka/components/group/field/__init__.py @@ -1,9 +1,9 @@ from typing import List import click -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import * +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import * from .funcs import \ add_field_group, \ remove_field_group, \ diff --git a/austrakka/components/group/field/funcs.py b/trakka/components/group/field/funcs.py similarity index 82% rename from austrakka/components/group/field/funcs.py rename to trakka/components/group/field/funcs.py index c9c08b4f..39a56081 100644 --- a/austrakka/components/group/field/funcs.py +++ b/trakka/components/group/field/funcs.py @@ -1,10 +1,10 @@ from typing import List -from austrakka.utils.api import api_get -from austrakka.utils.api import api_patch -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dataframe, read_pd -from austrakka.utils.paths import GROUP_PATH +from trakka.utils.api import api_get +from trakka.utils.api import api_patch +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dataframe, read_pd +from trakka.utils.paths import GROUP_PATH @logger_wraps() diff --git a/austrakka/components/group/funcs.py b/trakka/components/group/funcs.py similarity index 74% rename from austrakka/components/group/funcs.py rename to trakka/components/group/funcs.py index 8e76adad..562536b8 100644 --- a/austrakka/components/group/funcs.py +++ b/trakka/components/group/funcs.py @@ -1,11 +1,11 @@ from loguru import logger -from austrakka.utils.api import api_get -from austrakka.utils.api import api_post -from austrakka.utils.api import api_put -from austrakka.utils.helpers.groups import format_group_dto_for_output -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import GROUP_PATH +from trakka.utils.api import api_get +from trakka.utils.api import api_post +from trakka.utils.api import api_put +from trakka.utils.helpers.groups import format_group_dto_for_output +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import GROUP_PATH @logger_wraps() diff --git a/austrakka/components/group/role/__init__.py b/trakka/components/group/role/__init__.py similarity index 87% rename from austrakka/components/group/role/__init__.py rename to trakka/components/group/role/__init__.py index 2d30ff0a..a97e088a 100644 --- a/austrakka/components/group/role/__init__.py +++ b/trakka/components/group/role/__init__.py @@ -1,8 +1,8 @@ from typing import List -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import * +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import * from .funcs import list_role, add_role, remove_role diff --git a/austrakka/components/group/role/funcs.py b/trakka/components/group/role/funcs.py similarity index 85% rename from austrakka/components/group/role/funcs.py rename to trakka/components/group/role/funcs.py index 3ee7f508..a231aa50 100644 --- a/austrakka/components/group/role/funcs.py +++ b/trakka/components/group/role/funcs.py @@ -2,10 +2,10 @@ from loguru import logger -from austrakka.utils.api import api_patch -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import GROUP_PATH +from trakka.utils.api import api_patch +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import GROUP_PATH @logger_wraps() diff --git a/austrakka/components/iam/__init__.py b/trakka/components/iam/__init__.py similarity index 88% rename from austrakka/components/iam/__init__.py rename to trakka/components/iam/__init__.py index 973ea447..0dcce9bb 100644 --- a/austrakka/components/iam/__init__.py +++ b/trakka/components/iam/__init__.py @@ -1,7 +1,7 @@ # pylint: disable=expression-not-assigned import click -from austrakka.utils.privilege import TENANT_RESOURCE +from trakka.utils.privilege import TENANT_RESOURCE from .privilege import privilege_subcommands from .scope import scope from .role import role diff --git a/austrakka/components/iam/privilege/__init__.py b/trakka/components/iam/privilege/__init__.py similarity index 100% rename from austrakka/components/iam/privilege/__init__.py rename to trakka/components/iam/privilege/__init__.py diff --git a/austrakka/components/iam/privilege/funcs.py b/trakka/components/iam/privilege/funcs.py similarity index 87% rename from austrakka/components/iam/privilege/funcs.py rename to trakka/components/iam/privilege/funcs.py index 46a3e7db..273840d2 100644 --- a/austrakka/components/iam/privilege/funcs.py +++ b/trakka/components/iam/privilege/funcs.py @@ -1,8 +1,8 @@ -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.privilege import get_priv_path +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.privilege import get_priv_path -from austrakka.utils.api import api_delete, api_post -from austrakka.utils.misc import logger_wraps +from trakka.utils.api import api_delete, api_post +from trakka.utils.misc import logger_wraps @logger_wraps() diff --git a/austrakka/components/iam/privilege/subcommands.py b/trakka/components/iam/privilege/subcommands.py similarity index 95% rename from austrakka/components/iam/privilege/subcommands.py rename to trakka/components/iam/privilege/subcommands.py index 2a9b8ebc..3aa1ee17 100644 --- a/austrakka/components/iam/privilege/subcommands.py +++ b/trakka/components/iam/privilege/subcommands.py @@ -1,13 +1,13 @@ import click -from austrakka.utils.privilege import TENANT_RESOURCE -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import ( +from trakka.utils.privilege import TENANT_RESOURCE +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import ( opt_role, opt_user_identifier, opt_identifier) -from austrakka.utils.output import table_format_option +from trakka.utils.output import table_format_option from .funcs import ( list_privileges, list_by_role_privileges, diff --git a/austrakka/components/iam/role/__init__.py b/trakka/components/iam/role/__init__.py similarity index 95% rename from austrakka/components/iam/role/__init__.py rename to trakka/components/iam/role/__init__.py index cf00ef07..66211ebf 100644 --- a/austrakka/components/iam/role/__init__.py +++ b/trakka/components/iam/role/__init__.py @@ -1,7 +1,7 @@ import click -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import * -from austrakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import * +from trakka.utils.output import table_format_option from .scope import scope from .funcs import list_roles, add_role, update_role, delete_role diff --git a/austrakka/components/iam/role/funcs.py b/trakka/components/iam/role/funcs.py similarity index 89% rename from austrakka/components/iam/role/funcs.py rename to trakka/components/iam/role/funcs.py index ae2be648..c1229e2f 100644 --- a/austrakka/components/iam/role/funcs.py +++ b/trakka/components/iam/role/funcs.py @@ -1,9 +1,9 @@ -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.output import get_viewtype_columns -from austrakka.utils.paths import ROLES_V2_PATH -from austrakka.utils.api import api_post, api_patch, api_delete +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.output import get_viewtype_columns +from trakka.utils.paths import ROLES_V2_PATH +from trakka.utils.api import api_post, api_patch, api_delete -from austrakka.utils.misc import logger_wraps +from trakka.utils.misc import logger_wraps list_compact_fields = ['name', 'description', 'privilegeLevel'] list_more_fields = [ diff --git a/austrakka/components/iam/role/scope/__init__.py b/trakka/components/iam/role/scope/__init__.py similarity index 82% rename from austrakka/components/iam/role/scope/__init__.py rename to trakka/components/iam/role/scope/__init__.py index f93768b3..de0ab85b 100644 --- a/austrakka/components/iam/role/scope/__init__.py +++ b/trakka/components/iam/role/scope/__init__.py @@ -1,9 +1,9 @@ -from austrakka.components.iam.role.scope.funcs import ( +from trakka.components.iam.role.scope.funcs import ( add_role_scope, remove_role_scope) -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import * +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import * @click.group() diff --git a/austrakka/components/iam/role/scope/funcs.py b/trakka/components/iam/role/scope/funcs.py similarity index 76% rename from austrakka/components/iam/role/scope/funcs.py rename to trakka/components/iam/role/scope/funcs.py index 999b5c5c..509231c8 100644 --- a/austrakka/components/iam/role/scope/funcs.py +++ b/trakka/components/iam/role/scope/funcs.py @@ -1,6 +1,6 @@ -from austrakka.utils.api import api_patch -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import ROLES_V2_PATH +from trakka.utils.api import api_patch +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import ROLES_V2_PATH @logger_wraps() def add_role_scope(role: str, global_ids: list[str]): diff --git a/austrakka/components/iam/scope/__init__.py b/trakka/components/iam/scope/__init__.py similarity index 73% rename from austrakka/components/iam/scope/__init__.py rename to trakka/components/iam/scope/__init__.py index f6b334e8..f1503b29 100644 --- a/austrakka/components/iam/scope/__init__.py +++ b/trakka/components/iam/scope/__init__.py @@ -1,6 +1,6 @@ -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import * -from austrakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import * +from trakka.utils.output import table_format_option from .funcs import list_scopes diff --git a/austrakka/components/iam/scope/funcs.py b/trakka/components/iam/scope/funcs.py similarity index 70% rename from austrakka/components/iam/scope/funcs.py rename to trakka/components/iam/scope/funcs.py index b04d6b2e..092b1e40 100644 --- a/austrakka/components/iam/scope/funcs.py +++ b/trakka/components/iam/scope/funcs.py @@ -1,7 +1,7 @@ -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.output import get_viewtype_columns -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import SCOPES_PATH +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.output import get_viewtype_columns +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import SCOPES_PATH list_compact_fields = [ 'name', diff --git a/austrakka/components/log/__init__.py b/trakka/components/log/__init__.py similarity index 100% rename from austrakka/components/log/__init__.py rename to trakka/components/log/__init__.py diff --git a/austrakka/components/log/funcs.py b/trakka/components/log/funcs.py similarity index 87% rename from austrakka/components/log/funcs.py rename to trakka/components/log/funcs.py index 801526d4..89fe9a25 100644 --- a/austrakka/components/log/funcs.py +++ b/trakka/components/log/funcs.py @@ -1,9 +1,9 @@ from loguru import logger -from austrakka.utils.api import api_get -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dataframe, read_pd, get_viewtype_columns -from austrakka.utils.privilege import get_priv_path -from austrakka.utils.datetimes import dt_parse +from trakka.utils.api import api_get +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dataframe, read_pd, get_viewtype_columns +from trakka.utils.privilege import get_priv_path +from trakka.utils.datetimes import dt_parse COMPACT_FIELDS = ['eventTime','resourceType','resourceName','eventType', 'eventStatus','submitterUsername'] diff --git a/austrakka/components/log/subcommands.py b/trakka/components/log/subcommands.py similarity index 89% rename from austrakka/components/log/subcommands.py rename to trakka/components/log/subcommands.py index dddbf2f1..7cadf89a 100644 --- a/austrakka/components/log/subcommands.py +++ b/trakka/components/log/subcommands.py @@ -1,9 +1,9 @@ import click -from austrakka.utils.privilege import TENANT_RESOURCE -from austrakka.components.log.funcs import list_logs -from austrakka.utils.output import table_format_option -from austrakka.utils.options import opt_identifier, opt_view_type +from trakka.utils.privilege import TENANT_RESOURCE +from trakka.components.log.funcs import list_logs +from trakka.utils.output import table_format_option +from trakka.utils.options import opt_identifier, opt_view_type def log_subcommands(root_type: str): root_type_name = 'system' if root_type == TENANT_RESOURCE else root_type.lower() diff --git a/austrakka/components/metadata/__init__.py b/trakka/components/metadata/__init__.py similarity index 84% rename from austrakka/components/metadata/__init__.py rename to trakka/components/metadata/__init__.py index 414745f7..d1d7a424 100644 --- a/austrakka/components/metadata/__init__.py +++ b/trakka/components/metadata/__init__.py @@ -5,16 +5,16 @@ from io import BufferedReader import click -from austrakka.utils.options import opt_proforma, opt_batch_size, opt_owner_org, opt_shared_projects -from austrakka.utils.options import opt_is_update -from austrakka.utils.options import opt_group_name -from austrakka.utils.options import opt_blanks_delete -from austrakka.utils.options import opt_field_name -from austrakka.components.metadata.funcs import add_metadata -from austrakka.components.metadata.funcs import validate_metadata -from austrakka.components.metadata.funcs import append_metadata -from austrakka.components.metadata.funcs import list_metadata, list_metadata_by_field -from austrakka.utils.output import table_format_option, FORMATS +from trakka.utils.options import opt_proforma, opt_batch_size, opt_owner_org, opt_shared_projects +from trakka.utils.options import opt_is_update +from trakka.utils.options import opt_group_name +from trakka.utils.options import opt_blanks_delete +from trakka.utils.options import opt_field_name +from trakka.components.metadata.funcs import add_metadata +from trakka.components.metadata.funcs import validate_metadata +from trakka.components.metadata.funcs import append_metadata +from trakka.components.metadata.funcs import list_metadata, list_metadata_by_field +from trakka.utils.output import table_format_option, FORMATS ADD_APPEND_BATCH_SIZE_HELP = ( 'The number of rows to split the metadata upload into before uploading. ' diff --git a/austrakka/components/metadata/funcs.py b/trakka/components/metadata/funcs.py similarity index 93% rename from austrakka/components/metadata/funcs.py rename to trakka/components/metadata/funcs.py index e84d2df7..4ab040b4 100644 --- a/austrakka/components/metadata/funcs.py +++ b/trakka/components/metadata/funcs.py @@ -7,12 +7,12 @@ from loguru import logger import pandas as pd -from austrakka.utils.misc import logger_wraps -from austrakka.utils.api import api_post_multipart -from austrakka.utils.paths import SUBMISSION_PATH -from austrakka.utils.paths import METADATA_SEARCH_PATH -from austrakka.utils.helpers.groups import get_group_by_name -from austrakka.utils.helpers.output import call_get_and_print +from trakka.utils.misc import logger_wraps +from trakka.utils.api import api_post_multipart +from trakka.utils.paths import SUBMISSION_PATH +from trakka.utils.paths import METADATA_SEARCH_PATH +from trakka.utils.helpers.groups import get_group_by_name +from trakka.utils.helpers.output import call_get_and_print SUBMISSION_UPLOAD = 'UploadSubmissions' SUBMISSION_UPLOAD_APPEND = 'UploadSubmissions?appendMode=True' diff --git a/austrakka/components/org/__init__.py b/trakka/components/org/__init__.py similarity index 71% rename from austrakka/components/org/__init__.py rename to trakka/components/org/__init__.py index 0680b55a..2c360543 100644 --- a/austrakka/components/org/__init__.py +++ b/trakka/components/org/__init__.py @@ -1,15 +1,15 @@ import click -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import opt_name -from austrakka.utils.options import opt_abbrev -from austrakka.utils.options import opt_is_active -from austrakka.utils.options import opt_country -from austrakka.utils.options import opt_state -from austrakka.utils.privilege import ORG_RESOURCE -from austrakka.components.iam.privilege import privilege_subcommands -from austrakka.components.log import log_subcommands +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import opt_name +from trakka.utils.options import opt_abbrev +from trakka.utils.options import opt_is_active +from trakka.utils.options import opt_country +from trakka.utils.options import opt_state +from trakka.utils.privilege import ORG_RESOURCE +from trakka.components.iam.privilege import privilege_subcommands +from trakka.components.log import log_subcommands from .funcs import list_orgs from .funcs import add_org from .funcs import update_org diff --git a/austrakka/components/org/funcs.py b/trakka/components/org/funcs.py similarity index 80% rename from austrakka/components/org/funcs.py rename to trakka/components/org/funcs.py index 51cd87b4..f938f0a0 100644 --- a/austrakka/components/org/funcs.py +++ b/trakka/components/org/funcs.py @@ -1,9 +1,9 @@ -from austrakka.utils.api import api_post -from austrakka.utils.api import api_put -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import ORG_PATH -from austrakka.utils.helpers.orgs import get_org_by_abbrev -from austrakka.utils.helpers.output import call_get_and_print +from trakka.utils.api import api_post +from trakka.utils.api import api_put +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import ORG_PATH +from trakka.utils.helpers.orgs import get_org_by_abbrev +from trakka.utils.helpers.output import call_get_and_print @logger_wraps() diff --git a/austrakka/components/plot/__init__.py b/trakka/components/plot/__init__.py similarity index 81% rename from austrakka/components/plot/__init__.py rename to trakka/components/plot/__init__.py index 78a7890d..df7cd30e 100644 --- a/austrakka/components/plot/__init__.py +++ b/trakka/components/plot/__init__.py @@ -3,15 +3,15 @@ import click -from austrakka.components.plot.funcs import add_plot, update_plot, disable_plot, enable_plot, \ +from trakka.components.plot.funcs import add_plot, update_plot, disable_plot, enable_plot, \ list_plot_types, list_plots -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import opt_abbrev, opt_plottype, opt_plotspec -from austrakka.utils.options import opt_description -from austrakka.utils.options import opt_is_active -from austrakka.utils.options import opt_project -from austrakka.utils.options import opt_name +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import opt_abbrev, opt_plottype, opt_plotspec +from trakka.utils.options import opt_description +from trakka.utils.options import opt_is_active +from trakka.utils.options import opt_project +from trakka.utils.options import opt_name @click.group() diff --git a/austrakka/components/plot/funcs.py b/trakka/components/plot/funcs.py similarity index 88% rename from austrakka/components/plot/funcs.py rename to trakka/components/plot/funcs.py index 2e10c6ad..50840fe0 100644 --- a/austrakka/components/plot/funcs.py +++ b/trakka/components/plot/funcs.py @@ -2,12 +2,12 @@ from loguru import logger -from austrakka.utils.api import api_post, api_patch, api_get, api_put -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.helpers.project import get_project_by_abbrev -from austrakka.utils.helpers.plots import get_plot_by_abbrev -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import PLOT_PATH +from trakka.utils.api import api_post, api_patch, api_get, api_put +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.helpers.project import get_project_by_abbrev +from trakka.utils.helpers.plots import get_plot_by_abbrev +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import PLOT_PATH @logger_wraps() diff --git a/austrakka/components/proforma/__init__.py b/trakka/components/proforma/__init__.py similarity index 96% rename from austrakka/components/proforma/__init__.py rename to trakka/components/proforma/__init__.py index 74595084..9ffc4206 100644 --- a/austrakka/components/proforma/__init__.py +++ b/trakka/components/proforma/__init__.py @@ -1,10 +1,10 @@ from typing import List -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.privilege import PROFORMA_RESOURCE -from austrakka.components.log import log_subcommands +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.privilege import PROFORMA_RESOURCE +from trakka.components.log import log_subcommands from .funcs import \ add_proforma, \ update_proforma, \ @@ -233,7 +233,7 @@ def proforma_show(proforma_abbrev: str, out_format: str): """ Show pro forma fields. - See `austrakka proforma list` for available pro formas. + See `trakka proforma list` for available pro formas. """ show_proforma(proforma_abbrev, out_format) diff --git a/austrakka/components/proforma/funcs.py b/trakka/components/proforma/funcs.py similarity index 94% rename from austrakka/components/proforma/funcs.py rename to trakka/components/proforma/funcs.py index e1cb51d6..546bccc4 100644 --- a/austrakka/components/proforma/funcs.py +++ b/trakka/components/proforma/funcs.py @@ -5,17 +5,17 @@ from loguru import logger -from austrakka.utils.api import api_get -from austrakka.utils.api import api_post -from austrakka.utils.api import api_patch -from austrakka.utils.api import api_put -from austrakka.utils.exceptions import FailedResponseException, UnknownResponseException -from austrakka.utils.helpers.upload import upload_multipart -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dataframe, log_response, get_viewtype_columns -from austrakka.utils.paths import PROFORMA_PATH -from austrakka.utils.retry import retry -from austrakka.utils.fs import FileHash, get_hash +from trakka.utils.api import api_get +from trakka.utils.api import api_post +from trakka.utils.api import api_patch +from trakka.utils.api import api_put +from trakka.utils.exceptions import FailedResponseException, UnknownResponseException +from trakka.utils.helpers.upload import upload_multipart +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dataframe, log_response, get_viewtype_columns +from trakka.utils.paths import PROFORMA_PATH +from trakka.utils.retry import retry +from trakka.utils.fs import FileHash, get_hash from .proforma_generation_utils import generate_template ATTACH = 'Attach' @@ -217,7 +217,7 @@ def generate_proforma( for (mclass, valuestr) in metadata_classes } # Generate the spreadsheet - filename = f"AusTrakka_metadata_submission_{abbrev}_DRAFT.xlsx" + filename = f"Trakka_metadata_submission_{abbrev}_DRAFT.xlsx" logger.info(f"Generating template draft {filename}") generate_template( filename, field_df, restricted_values, metadata_classes, nndss_column) diff --git a/austrakka/components/proforma/proforma_generation_utils.py b/trakka/components/proforma/proforma_generation_utils.py similarity index 100% rename from austrakka/components/proforma/proforma_generation_utils.py rename to trakka/components/proforma/proforma_generation_utils.py diff --git a/austrakka/components/project/__init__.py b/trakka/components/project/__init__.py similarity index 87% rename from austrakka/components/project/__init__.py rename to trakka/components/project/__init__.py index 7be95645..3170fb7e 100644 --- a/austrakka/components/project/__init__.py +++ b/trakka/components/project/__init__.py @@ -1,20 +1,20 @@ # pylint: disable=expression-not-assigned import click -from austrakka.utils.output import table_format_option -from austrakka.utils.output import object_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import opt_abbrev, \ +from trakka.utils.output import table_format_option +from trakka.utils.output import object_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import opt_abbrev, \ opt_is_active, \ opt_type, \ opt_view_type, opt_project_client_type, opt_merge_algorithm -from austrakka.utils.options import opt_name -from austrakka.utils.options import opt_dashboard_name -from austrakka.utils.options import opt_description -from austrakka.utils.options import opt_organisation -from austrakka.utils.privilege import PROJECT_RESOURCE -from austrakka.components.log import log_subcommands -from austrakka.components.iam.privilege import privilege_subcommands +from trakka.utils.options import opt_name +from trakka.utils.options import opt_dashboard_name +from trakka.utils.options import opt_description +from trakka.utils.options import opt_organisation +from trakka.utils.privilege import PROJECT_RESOURCE +from trakka.components.log import log_subcommands +from trakka.components.iam.privilege import privilege_subcommands from .funcs import disable_project, enable_project, list_projects, \ add_project, \ update_project, \ diff --git a/austrakka/components/project/dataset/__init__.py b/trakka/components/project/dataset/__init__.py similarity index 89% rename from austrakka/components/project/dataset/__init__.py rename to trakka/components/project/dataset/__init__.py index b032199f..019d2fab 100644 --- a/austrakka/components/project/dataset/__init__.py +++ b/trakka/components/project/dataset/__init__.py @@ -1,12 +1,12 @@ import click -from austrakka.utils.options import opt_analysis_label, \ +from trakka.utils.options import opt_analysis_label, \ opt_tracking_token, \ opt_detailed -from austrakka.components.project.dataset.funcs import add_dataset_blocking, \ +from trakka.components.project.dataset.funcs import add_dataset_blocking, \ active_dataset_entry_list_get, disable_dataset -from austrakka.components.project.dataset.funcs import add_dataset, \ +from trakka.components.project.dataset.funcs import add_dataset, \ track_dataset -from austrakka.utils.output import table_format_option +from trakka.utils.output import table_format_option @click.group() diff --git a/austrakka/components/project/dataset/funcs.py b/trakka/components/project/dataset/funcs.py similarity index 90% rename from austrakka/components/project/dataset/funcs.py rename to trakka/components/project/dataset/funcs.py index c0ec9fba..36868d8b 100644 --- a/austrakka/components/project/dataset/funcs.py +++ b/trakka/components/project/dataset/funcs.py @@ -3,14 +3,14 @@ import time from loguru import logger -from austrakka.utils.api import api_get, api_patch -from austrakka.utils.fs import get_hash -from austrakka.utils.helpers.output import call_get_and_print_table_on_state_change -from austrakka.utils.helpers.output import call_get_and_print_dataset_status -from austrakka.utils.helpers.upload import upload_multipart_tracking_token -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dict -from austrakka.utils.paths import PROJECT_PATH +from trakka.utils.api import api_get, api_patch +from trakka.utils.fs import get_hash +from trakka.utils.helpers.output import call_get_and_print_table_on_state_change +from trakka.utils.helpers.output import call_get_and_print_dataset_status +from trakka.utils.helpers.upload import upload_multipart_tracking_token +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dict +from trakka.utils.paths import PROJECT_PATH DATASET_UPLOAD_PATH = 'dataset' DATASET_ACK_PATH = 'acknowledge' diff --git a/austrakka/components/project/field/__init__.py b/trakka/components/project/field/__init__.py similarity index 89% rename from austrakka/components/project/field/__init__.py rename to trakka/components/project/field/__init__.py index 633d9de1..380f6e97 100644 --- a/austrakka/components/project/field/__init__.py +++ b/trakka/components/project/field/__init__.py @@ -1,10 +1,10 @@ from typing import List import click -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.output import table_format_option -from austrakka.utils.options import \ +from trakka.utils.options import \ opt_field_name, \ opt_field_and_source from .funcs import \ diff --git a/austrakka/components/project/field/funcs.py b/trakka/components/project/field/funcs.py similarity index 92% rename from austrakka/components/project/field/funcs.py rename to trakka/components/project/field/funcs.py index 5d59eca0..9d105be5 100644 --- a/austrakka/components/project/field/funcs.py +++ b/trakka/components/project/field/funcs.py @@ -1,10 +1,10 @@ from typing import List from loguru import logger -from austrakka.utils.api import api_patch, api_get -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dict -from austrakka.utils.paths import PROJECT_PATH +from trakka.utils.api import api_patch, api_get +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dict +from trakka.utils.paths import PROJECT_PATH # pylint: disable=duplicate-code diff --git a/austrakka/components/project/funcs.py b/trakka/components/project/funcs.py similarity index 88% rename from austrakka/components/project/funcs.py rename to trakka/components/project/funcs.py index 3cd538aa..4e38c227 100644 --- a/austrakka/components/project/funcs.py +++ b/trakka/components/project/funcs.py @@ -1,16 +1,16 @@ # pylint: disable=duplicate-code -from austrakka.utils.api import api_post -from austrakka.utils.api import api_patch -from austrakka.utils.api import api_put -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.helpers.project import get_project_by_abbrev -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import get_viewtype_columns -from austrakka.utils.paths import PROJECT_PATH -from austrakka.utils.paths import SET_TYPE -from austrakka.utils.paths import SET_DASHBOARD -from austrakka.utils.paths import ASSIGNED_DASHBOARD +from trakka.utils.api import api_post +from trakka.utils.api import api_patch +from trakka.utils.api import api_put +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.helpers.project import get_project_by_abbrev +from trakka.utils.misc import logger_wraps +from trakka.utils.output import get_viewtype_columns +from trakka.utils.paths import PROJECT_PATH +from trakka.utils.paths import SET_TYPE +from trakka.utils.paths import SET_DASHBOARD +from trakka.utils.paths import ASSIGNED_DASHBOARD compact_fields = [ "projectId", # Project ID diff --git a/austrakka/components/project/metadata/__init__.py b/trakka/components/project/metadata/__init__.py similarity index 88% rename from austrakka/components/project/metadata/__init__.py rename to trakka/components/project/metadata/__init__.py index 89b098a6..d8f06761 100644 --- a/austrakka/components/project/metadata/__init__.py +++ b/trakka/components/project/metadata/__init__.py @@ -2,10 +2,10 @@ import click -from austrakka.utils.output import table_format_option -from austrakka.utils.output import FORMATS -from austrakka.utils.options import opt_merge_algorithm -from austrakka.utils.options import opt_view_id +from trakka.utils.output import table_format_option +from trakka.utils.output import FORMATS +from trakka.utils.options import opt_merge_algorithm +from trakka.utils.options import opt_view_id from .funcs import list_dataset_views, \ download_dataset_view diff --git a/austrakka/components/project/metadata/funcs.py b/trakka/components/project/metadata/funcs.py similarity index 81% rename from austrakka/components/project/metadata/funcs.py rename to trakka/components/project/metadata/funcs.py index b4d30c82..fc18dff6 100644 --- a/austrakka/components/project/metadata/funcs.py +++ b/trakka/components/project/metadata/funcs.py @@ -5,13 +5,13 @@ import httpx from httpx import HTTPStatusError from loguru import logger -from austrakka.utils.api import api_get, api_get_stream -from austrakka.utils.exceptions import FailedResponseException, UnknownResponseException -from austrakka.utils.http import get_header_value, HEADERS -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dict -from austrakka.utils.output import log_response_compact -from austrakka.utils.paths import PROJECT_PATH +from trakka.utils.api import api_get, api_get_stream +from trakka.utils.exceptions import FailedResponseException, UnknownResponseException +from trakka.utils.http import get_header_value, HEADERS +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dict +from trakka.utils.output import log_response_compact +from trakka.utils.paths import PROJECT_PATH @logger_wraps() diff --git a/austrakka/components/project/provision/__init__.py b/trakka/components/project/provision/__init__.py similarity index 91% rename from austrakka/components/project/provision/__init__.py rename to trakka/components/project/provision/__init__.py index 214d6beb..7d8cb467 100644 --- a/austrakka/components/project/provision/__init__.py +++ b/trakka/components/project/provision/__init__.py @@ -1,9 +1,9 @@ from typing import List import click -from austrakka.utils.cmd_filter import hide_admin_cmds, show_admin_cmds -from austrakka.utils.output import table_format_option -from austrakka.utils.options import \ +from trakka.utils.cmd_filter import hide_admin_cmds, show_admin_cmds +from trakka.utils.output import table_format_option +from trakka.utils.options import \ opt_field_name, \ opt_prov_id diff --git a/austrakka/components/project/provision/funcs.py b/trakka/components/project/provision/funcs.py similarity index 88% rename from austrakka/components/project/provision/funcs.py rename to trakka/components/project/provision/funcs.py index eb907321..3aecce20 100644 --- a/austrakka/components/project/provision/funcs.py +++ b/trakka/components/project/provision/funcs.py @@ -1,10 +1,10 @@ from typing import List from loguru import logger -from austrakka.utils.api import api_patch, api_get -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dict -from austrakka.utils.paths import PROJECT_PATH +from trakka.utils.api import api_patch, api_get +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dict +from trakka.utils.paths import PROJECT_PATH @logger_wraps() diff --git a/austrakka/components/sample/__init__.py b/trakka/components/sample/__init__.py similarity index 93% rename from austrakka/components/sample/__init__.py rename to trakka/components/sample/__init__.py index 6fbc333c..ae2411da 100644 --- a/austrakka/components/sample/__init__.py +++ b/trakka/components/sample/__init__.py @@ -2,10 +2,10 @@ from io import BufferedReader import click -from austrakka.utils.options import opt_seq_id, opt_group_name, opt_project, options_seq_id_or_file -from austrakka.utils.option_utils import get_seq_list -from austrakka.utils.option_utils import RequiredMutuallyExclusiveOption -from austrakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import opt_seq_id, opt_group_name, opt_project, options_seq_id_or_file +from trakka.utils.option_utils import get_seq_list +from trakka.utils.option_utils import RequiredMutuallyExclusiveOption +from trakka.utils.cmd_filter import hide_admin_cmds from ...utils.option_utils import create_option from ...utils.output import table_format_option from ...utils.output import object_format_option diff --git a/austrakka/components/sample/funcs.py b/trakka/components/sample/funcs.py similarity index 83% rename from austrakka/components/sample/funcs.py rename to trakka/components/sample/funcs.py index b8540af2..96acb54c 100644 --- a/austrakka/components/sample/funcs.py +++ b/trakka/components/sample/funcs.py @@ -1,10 +1,10 @@ -from austrakka.utils.helpers.share import resolve_share_target -from austrakka.utils.misc import logger_wraps -from austrakka.utils.api import api_patch, api_get -from austrakka.utils.paths import SAMPLE_PATH -from austrakka.utils.paths import ORG_V2_PATH -from austrakka.utils.helpers.groups import format_group_dto_for_output -from austrakka.utils.helpers.output import call_get_and_print +from trakka.utils.helpers.share import resolve_share_target +from trakka.utils.misc import logger_wraps +from trakka.utils.api import api_patch, api_get +from trakka.utils.paths import SAMPLE_PATH +from trakka.utils.paths import ORG_V2_PATH +from trakka.utils.helpers.groups import format_group_dto_for_output +from trakka.utils.helpers.output import call_get_and_print DISABLE = 'Disable' ENABLE = 'Enable' diff --git a/austrakka/components/sequence/__init__.py b/trakka/components/sequence/__init__.py similarity index 82% rename from austrakka/components/sequence/__init__.py rename to trakka/components/sequence/__init__.py index aee7741d..dba6ac7f 100644 --- a/austrakka/components/sequence/__init__.py +++ b/trakka/components/sequence/__init__.py @@ -3,18 +3,18 @@ import click -from austrakka.utils.output import table_format_option +from trakka.utils.output import table_format_option -from austrakka.utils.option_utils import RequiredMutuallyExclusiveOption -from austrakka.utils.options import opt_seq_type -from austrakka.utils.options import opt_group_name -from austrakka.utils.options import opt_output_dir -from austrakka.utils.options import opt_seq_id -from austrakka.utils.options import opt_force_mutex_skip -from austrakka.utils.options import opt_skip_mutex_force -from austrakka.utils.options import opt_delete_all +from trakka.utils.option_utils import RequiredMutuallyExclusiveOption +from trakka.utils.options import opt_seq_type +from trakka.utils.options import opt_group_name +from trakka.utils.options import opt_output_dir +from trakka.utils.options import opt_seq_id +from trakka.utils.options import opt_force_mutex_skip +from trakka.utils.options import opt_skip_mutex_force +from trakka.utils.options import opt_delete_all -from austrakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.cmd_filter import hide_admin_cmds from .funcs import get_sequences from .funcs import list_sequences @@ -60,7 +60,7 @@ def seq_get( EXAMPLE: Download Fasta for group Example-Group - austrakka seq get -t fasta --group-name Example-Group --outdir ~/Downloads/fasta-files + trakka seq get -t fasta --group-name Example-Group --outdir ~/Downloads/fasta-files """ seq_type_enum = convert_to_seq_type(seq_type) diff --git a/austrakka/components/sequence/add/__init__.py b/trakka/components/sequence/add/__init__.py similarity index 94% rename from austrakka/components/sequence/add/__init__.py rename to trakka/components/sequence/add/__init__.py index 733c012b..0519fffa 100644 --- a/austrakka/components/sequence/add/__init__.py +++ b/trakka/components/sequence/add/__init__.py @@ -3,12 +3,12 @@ import click -from austrakka.utils.enums.seq import SeqType -from austrakka.utils.options import opt_force_mutex_skip -from austrakka.utils.options import opt_owner_org -from austrakka.utils.options import opt_skip_mutex_force -from austrakka.utils.options import opt_shared_projects -from austrakka.utils.options import opt_create_samples +from trakka.utils.enums.seq import SeqType +from trakka.utils.options import opt_force_mutex_skip +from trakka.utils.options import opt_owner_org +from trakka.utils.options import opt_skip_mutex_force +from trakka.utils.options import opt_shared_projects +from trakka.utils.options import opt_create_samples from ..funcs import add_fasta_cns_submission from ..funcs import add_sequence_submission diff --git a/austrakka/components/sequence/funcs.py b/trakka/components/sequence/funcs.py similarity index 93% rename from austrakka/components/sequence/funcs.py rename to trakka/components/sequence/funcs.py index 7e553dcb..fc40a72e 100644 --- a/austrakka/components/sequence/funcs.py +++ b/trakka/components/sequence/funcs.py @@ -15,34 +15,34 @@ from httpx import HTTPStatusError from Bio import SeqIO -from austrakka.utils.exceptions import FailedResponseException, CliArgumentException -from austrakka.utils.exceptions import UnknownResponseException -from austrakka.utils.exceptions import IncorrectHashException -from austrakka.utils.misc import logger_wraps -from austrakka.utils.api import api_patch -from austrakka.utils.api import api_post_multipart_raw -from austrakka.utils.api import api_get -from austrakka.utils.api import api_post -from austrakka.utils.api import get_response -from austrakka.utils.api import api_get_stream -from austrakka.utils.enums.api import RESPONSE_TYPE_ERROR -from austrakka.utils.paths import SAMPLE_PATH -from austrakka.utils.paths import SEQUENCE_PATH -from austrakka.utils.paths import SEQUENCE_TYPE_QUERY -from austrakka.utils.paths import SEQUENCE_READ_QUERY -from austrakka.utils.paths import SEQUENCE_DOWNLOAD_PATH -from austrakka.utils.paths import SEQUENCE_BY_GROUP_PATH -from austrakka.utils.paths import SEQUENCE_BY_SAMPLE_PATH -from austrakka.utils.output import create_response_object -from austrakka.utils.output import log_response -from austrakka.utils.output import log_response_compact -from austrakka.utils.fs import create_dir - -from austrakka.utils.output import print_dataframe -from austrakka.utils.enums.seq import SeqType -from austrakka.utils.retry import retry -from austrakka.utils.api import api_delete -from austrakka.utils.fs import FileHash, verify_hash +from trakka.utils.exceptions import FailedResponseException, CliArgumentException +from trakka.utils.exceptions import UnknownResponseException +from trakka.utils.exceptions import IncorrectHashException +from trakka.utils.misc import logger_wraps +from trakka.utils.api import api_patch +from trakka.utils.api import api_post_multipart_raw +from trakka.utils.api import api_get +from trakka.utils.api import api_post +from trakka.utils.api import get_response +from trakka.utils.api import api_get_stream +from trakka.utils.enums.api import RESPONSE_TYPE_ERROR +from trakka.utils.paths import SAMPLE_PATH +from trakka.utils.paths import SEQUENCE_PATH +from trakka.utils.paths import SEQUENCE_TYPE_QUERY +from trakka.utils.paths import SEQUENCE_READ_QUERY +from trakka.utils.paths import SEQUENCE_DOWNLOAD_PATH +from trakka.utils.paths import SEQUENCE_BY_GROUP_PATH +from trakka.utils.paths import SEQUENCE_BY_SAMPLE_PATH +from trakka.utils.output import create_response_object +from trakka.utils.output import log_response +from trakka.utils.output import log_response_compact +from trakka.utils.fs import create_dir + +from trakka.utils.output import print_dataframe +from trakka.utils.enums.seq import SeqType +from trakka.utils.retry import retry +from trakka.utils.api import api_delete +from trakka.utils.fs import FileHash, verify_hash SEQ_ID_CSV = 'Seq_ID' SEQ_ID_HEADER = 'seq-id' diff --git a/austrakka/components/sequence/sync/__init__.py b/trakka/components/sequence/sync/__init__.py similarity index 88% rename from austrakka/components/sequence/sync/__init__.py rename to trakka/components/sequence/sync/__init__.py index b2433933..9df085bf 100644 --- a/austrakka/components/sequence/sync/__init__.py +++ b/trakka/components/sequence/sync/__init__.py @@ -1,10 +1,10 @@ import click from click import option -from austrakka.utils.options import opt_output_dir, opt_group_name -from austrakka.utils.options import opt_recalc_hash -from austrakka.utils.options import opt_seq_type -from austrakka.utils.options import opt_batch_size +from trakka.utils.options import opt_output_dir, opt_group_name +from trakka.utils.options import opt_recalc_hash +from trakka.utils.options import opt_seq_type +from trakka.utils.options import opt_batch_size from .funcs import seq_sync_get diff --git a/austrakka/components/sequence/sync/constant.py b/trakka/components/sequence/sync/constant.py similarity index 100% rename from austrakka/components/sequence/sync/constant.py rename to trakka/components/sequence/sync/constant.py diff --git a/austrakka/components/sequence/sync/errors.py b/trakka/components/sequence/sync/errors.py similarity index 100% rename from austrakka/components/sequence/sync/errors.py rename to trakka/components/sequence/sync/errors.py diff --git a/austrakka/components/sequence/sync/funcs.py b/trakka/components/sequence/sync/funcs.py similarity index 96% rename from austrakka/components/sequence/sync/funcs.py rename to trakka/components/sequence/sync/funcs.py index 49deeb53..ac5aa63b 100644 --- a/austrakka/components/sequence/sync/funcs.py +++ b/trakka/components/sequence/sync/funcs.py @@ -3,8 +3,8 @@ from loguru import logger -from austrakka.utils.misc import logger_wraps -from austrakka.utils.fs import create_dir +from trakka.utils.misc import logger_wraps +from trakka.utils.fs import create_dir from .sync_state import initialise, load_state from .sync_workflow import select_start_state, configure_state_machine, reset from .sync_io import save_json diff --git a/austrakka/components/sequence/sync/state_machine.py b/trakka/components/sequence/sync/state_machine.py similarity index 100% rename from austrakka/components/sequence/sync/state_machine.py rename to trakka/components/sequence/sync/state_machine.py diff --git a/austrakka/components/sequence/sync/sync_io.py b/trakka/components/sequence/sync/sync_io.py similarity index 100% rename from austrakka/components/sequence/sync/sync_io.py rename to trakka/components/sequence/sync/sync_io.py diff --git a/austrakka/components/sequence/sync/sync_state.py b/trakka/components/sequence/sync/sync_state.py similarity index 100% rename from austrakka/components/sequence/sync/sync_state.py rename to trakka/components/sequence/sync/sync_state.py diff --git a/austrakka/components/sequence/sync/sync_validator.py b/trakka/components/sequence/sync/sync_validator.py similarity index 100% rename from austrakka/components/sequence/sync/sync_validator.py rename to trakka/components/sequence/sync/sync_validator.py diff --git a/austrakka/components/sequence/sync/sync_workflow.py b/trakka/components/sequence/sync/sync_workflow.py similarity index 98% rename from austrakka/components/sequence/sync/sync_workflow.py rename to trakka/components/sequence/sync/sync_workflow.py index aa6749fc..c63baef4 100644 --- a/austrakka/components/sequence/sync/sync_workflow.py +++ b/trakka/components/sequence/sync/sync_workflow.py @@ -8,11 +8,11 @@ from loguru import logger -from austrakka.components.sequence.funcs import _download_seq_file -from austrakka.components.sequence.funcs import _get_seq_download_path -from austrakka.utils.exceptions import raise_sync_exception_if_none -from austrakka.utils.retry import retry -from austrakka.utils.enums.seq import SeqType, convert_to_seq_type +from trakka.components.sequence.funcs import _download_seq_file +from trakka.components.sequence.funcs import _get_seq_download_path +from trakka.utils.exceptions import raise_sync_exception_if_none +from trakka.utils.retry import retry +from trakka.utils.enums.seq import SeqType, convert_to_seq_type from .errors import WorkflowError from .sync_io import \ diff --git a/austrakka/components/tree/__init__.py b/trakka/components/tree/__init__.py similarity index 75% rename from austrakka/components/tree/__init__.py rename to trakka/components/tree/__init__.py index 7f10b23f..fe47e897 100644 --- a/austrakka/components/tree/__init__.py +++ b/trakka/components/tree/__init__.py @@ -2,18 +2,18 @@ from io import BufferedReader import click -from austrakka.utils.output import table_format_option -from austrakka.components.tree.version import version -from austrakka.components.tree.funcs import list_trees, disable_tree, enable_tree -from austrakka.components.tree.funcs import add_tree -from austrakka.components.tree.funcs import update_tree -from austrakka.utils.cmd_filter import show_admin_cmds -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import opt_abbrev, opt_file, opt_show_disabled -from austrakka.utils.options import opt_name -from austrakka.utils.options import opt_description -from austrakka.utils.options import opt_is_active -from austrakka.utils.options import opt_project +from trakka.utils.output import table_format_option +from trakka.components.tree.version import version +from trakka.components.tree.funcs import list_trees, disable_tree, enable_tree +from trakka.components.tree.funcs import add_tree +from trakka.components.tree.funcs import update_tree +from trakka.utils.cmd_filter import show_admin_cmds +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import opt_abbrev, opt_file, opt_show_disabled +from trakka.utils.options import opt_name +from trakka.utils.options import opt_description +from trakka.utils.options import opt_is_active +from trakka.utils.options import opt_project @click.group() @@ -31,7 +31,7 @@ def tree(ctx): @opt_show_disabled() @table_format_option() def tree_list(project: str, show_disabled: bool, out_format: str): - '''List trees in AusTrakka''' + '''List trees''' list_trees(project, show_disabled, out_format) diff --git a/austrakka/components/tree/funcs.py b/trakka/components/tree/funcs.py similarity index 80% rename from austrakka/components/tree/funcs.py rename to trakka/components/tree/funcs.py index 2708a974..5482c856 100644 --- a/austrakka/components/tree/funcs.py +++ b/trakka/components/tree/funcs.py @@ -1,11 +1,11 @@ from io import BufferedReader -from austrakka.components.tree.version.funcs import add_tree_version -from austrakka.utils.api import api_post, api_patch -from austrakka.utils.api import api_put -from austrakka.utils.helpers.tree import get_tree_by_abbrev -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import TREE_PATH +from trakka.components.tree.version.funcs import add_tree_version +from trakka.utils.api import api_post, api_patch +from trakka.utils.api import api_put +from trakka.utils.helpers.tree import get_tree_by_abbrev +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import TREE_PATH @logger_wraps() diff --git a/austrakka/components/tree/version/__init__.py b/trakka/components/tree/version/__init__.py similarity index 100% rename from austrakka/components/tree/version/__init__.py rename to trakka/components/tree/version/__init__.py diff --git a/austrakka/components/tree/version/funcs.py b/trakka/components/tree/version/funcs.py similarity index 76% rename from austrakka/components/tree/version/funcs.py rename to trakka/components/tree/version/funcs.py index 7896ed4b..0e40062c 100644 --- a/austrakka/components/tree/version/funcs.py +++ b/trakka/components/tree/version/funcs.py @@ -1,11 +1,11 @@ from os import path from io import BufferedReader -from austrakka.utils.api import api_patch, api_post_multipart -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import TREE_VERSION_PATH -from austrakka.utils.helpers.tree import get_tree_by_abbrev +from trakka.utils.api import api_patch, api_post_multipart +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import TREE_VERSION_PATH +from trakka.utils.helpers.tree import get_tree_by_abbrev TREE_UPLOAD = 'UploadTree' ALL_VERSIONS = 'AllVersions' diff --git a/austrakka/components/user/__init__.py b/trakka/components/user/__init__.py similarity index 83% rename from austrakka/components/user/__init__.py rename to trakka/components/user/__init__.py index 893da5ff..5640e7b1 100644 --- a/austrakka/components/user/__init__.py +++ b/trakka/components/user/__init__.py @@ -2,9 +2,9 @@ import click -from austrakka.utils.output import table_format_option -from austrakka.utils.cmd_filter import hide_admin_cmds -from austrakka.utils.options import \ +from trakka.utils.output import table_format_option +from trakka.utils.cmd_filter import hide_admin_cmds +from trakka.utils.options import \ opt_user_identifier, \ opt_username, \ opt_owner_group_roles, \ @@ -13,13 +13,13 @@ opt_is_active, \ opt_user_no_dl_quota, \ opt_user_monthly_dl_quota_bytes, opt_user_position -from austrakka.utils.options import opt_is_austrakka_process -from austrakka.utils.options import opt_user_object_id -from austrakka.utils.options import opt_organisation -from austrakka.utils.options import opt_show_disabled -from austrakka.utils.options import opt_server_username -from austrakka.utils.privilege import USER_RESOURCE -from austrakka.components.log import log_subcommands +from trakka.utils.options import opt_is_trakka_process +from trakka.utils.options import opt_user_object_id +from trakka.utils.options import opt_organisation +from trakka.utils.options import opt_show_disabled +from trakka.utils.options import opt_server_username +from trakka.utils.privilege import USER_RESOURCE +from trakka.components.log import log_subcommands from .funcs import list_users from .funcs import add_user from .funcs import update_user @@ -48,7 +48,7 @@ def user_list(show_disabled: bool, out_format: str): @opt_username() @opt_organisation() @opt_owner_group_roles(required=False) -@opt_is_austrakka_process(default=False) +@opt_is_trakka_process(default=False) @opt_server_username() @opt_user_no_dl_quota() @opt_email_address() diff --git a/austrakka/components/user/funcs.py b/trakka/components/user/funcs.py similarity index 92% rename from austrakka/components/user/funcs.py rename to trakka/components/user/funcs.py index d7e31d68..6d5795a0 100644 --- a/austrakka/components/user/funcs.py +++ b/trakka/components/user/funcs.py @@ -2,12 +2,12 @@ from loguru import logger -from austrakka.utils.api import api_patch, api_get -from austrakka.utils.api import api_post -from austrakka.utils.api import api_put -from austrakka.utils.helpers.output import call_get_and_print -from austrakka.utils.misc import logger_wraps -from austrakka.utils.paths import USER_PATH, USER_V2_PATH +from trakka.utils.api import api_patch, api_get +from trakka.utils.api import api_post +from trakka.utils.api import api_put +from trakka.utils.helpers.output import call_get_and_print +from trakka.utils.misc import logger_wraps +from trakka.utils.paths import USER_PATH, USER_V2_PATH @logger_wraps() diff --git a/austrakka/main.py b/trakka/main.py similarity index 57% rename from austrakka/main.py rename to trakka/main.py index b69bcd8a..4639bc4f 100644 --- a/austrakka/main.py +++ b/trakka/main.py @@ -7,78 +7,78 @@ from click.core import Context from loguru import logger -from austrakka.utils.privilege import TENANT_RESOURCE +from trakka.utils.privilege import TENANT_RESOURCE -from austrakka.utils.context import CxtKey -from austrakka.utils.context import AusTrakkaCxt -from austrakka.components.admin import admin -from austrakka.components.auth import auth -from austrakka.components.user import user -from austrakka.components.org import org -from austrakka.components.log import log_subcommands -from austrakka.components.project import project -from austrakka.components.tree import tree -from austrakka.components.metadata import metadata -from austrakka.components.sequence import seq -from austrakka.components.proforma import proforma -from austrakka.components.field import field -from austrakka.components.fieldtype import fieldtype -from austrakka.components.group import group -from austrakka.components.sample import sample -from austrakka.components.dashboard import dashboard -from austrakka.components.plot import plot -from austrakka.components.iam import iam +from trakka.utils.context import CxtKey +from trakka.utils.context import TrakkaCxt +from trakka.components.admin import admin +from trakka.components.auth import auth +from trakka.components.user import user +from trakka.components.org import org +from trakka.components.log import log_subcommands +from trakka.components.project import project +from trakka.components.tree import tree +from trakka.components.metadata import metadata +from trakka.components.sequence import seq +from trakka.components.proforma import proforma +from trakka.components.field import field +from trakka.components.fieldtype import fieldtype +from trakka.components.group import group +from trakka.components.sample import sample +from trakka.components.dashboard import dashboard +from trakka.components.plot import plot +from trakka.components.iam import iam -from austrakka import __version__ as VERSION -from austrakka import __prog_name__ as PROG_NAME -from austrakka.utils.datetimes import LOCAL_TIMEZONE -from austrakka.utils.misc import AusTrakkaCliTopLevel -from austrakka.utils.logger import is_debug -from austrakka.utils.misc import HELP_OPTS -from austrakka.utils.exceptions import FailedResponseException -from austrakka.utils.output import log_response -from austrakka.utils.logger import setup_logger -from austrakka.utils.logger import LOG_LEVEL_INFO -from austrakka.utils.logger import LOG_LEVELS -from austrakka.utils.cmd_filter import show_admin_cmds -from austrakka.utils.version import check_version, warn_if_austrakka +from trakka import __version__ as VERSION +from trakka import __prog_name__ as PROG_NAME +from trakka.utils.datetimes import LOCAL_TIMEZONE +from trakka.utils.misc import TrakkaCliTopLevel +from trakka.utils.logger import is_debug +from trakka.utils.misc import HELP_OPTS +from trakka.utils.exceptions import FailedResponseException +from trakka.utils.output import log_response +from trakka.utils.logger import setup_logger +from trakka.utils.logger import LOG_LEVEL_INFO +from trakka.utils.logger import LOG_LEVELS +from trakka.utils.cmd_filter import show_admin_cmds +from trakka.utils.version import check_version, warn_if_austrakka CONTEXT_SETTINGS = {"help_option_names": HELP_OPTS} @click.group( - cls=AusTrakkaCliTopLevel, + cls=TrakkaCliTopLevel, context_settings=CONTEXT_SETTINGS, help=""" A cli for interfacing with Trakka. """, ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.URI), + TrakkaCxt.get_option_name(CxtKey.URI), show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.URI), + envvar=TrakkaCxt.get_env_var_name(CxtKey.URI), required=True ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.TOKEN), + TrakkaCxt.get_option_name(CxtKey.TOKEN), show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.TOKEN), + envvar=TrakkaCxt.get_env_var_name(CxtKey.TOKEN), required=True ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.LOG_LEVEL), + TrakkaCxt.get_option_name(CxtKey.LOG_LEVEL), show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.LOG_LEVEL), + envvar=TrakkaCxt.get_env_var_name(CxtKey.LOG_LEVEL), default=LOG_LEVEL_INFO, type=click.Choice(LOG_LEVELS), show_default=True ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.TIMEZONE), + TrakkaCxt.get_option_name(CxtKey.TIMEZONE), '-tz', show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.TIMEZONE), + envvar=TrakkaCxt.get_env_var_name(CxtKey.TIMEZONE), default=LOCAL_TIMEZONE, show_default=True, help='Timezone to use for any datetime output or parsing. ' @@ -86,9 +86,9 @@ 'or a recognised timezone string such as "UTC", "Australia/Perth" or "Europe/Madrid".' ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.SKIP_CERT_VERIFY), + TrakkaCxt.get_option_name(CxtKey.SKIP_CERT_VERIFY), show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.SKIP_CERT_VERIFY), + envvar=TrakkaCxt.get_env_var_name(CxtKey.SKIP_CERT_VERIFY), required=True, default=False, show_default=True, @@ -96,9 +96,9 @@ help="Skip verification of certificate" ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.USE_HTTP2), + TrakkaCxt.get_option_name(CxtKey.USE_HTTP2), show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.USE_HTTP2), + envvar=TrakkaCxt.get_env_var_name(CxtKey.USE_HTTP2), required=True, default=False, show_default=True, @@ -106,9 +106,9 @@ help="Use HTTP2 (experimental)" ) @click.option( - AusTrakkaCxt.get_option_name(CxtKey.SKIP_VERSION_CHECK), + TrakkaCxt.get_option_name(CxtKey.SKIP_VERSION_CHECK), show_envvar=True, - envvar=AusTrakkaCxt.get_env_var_name(CxtKey.SKIP_VERSION_CHECK), + envvar=TrakkaCxt.get_env_var_name(CxtKey.SKIP_VERSION_CHECK), required=True, default=False, show_default=True, @@ -180,8 +180,8 @@ def main(): log_response(ex.parsed_resp) sys.exit(1) except Exception as ex: # pylint: disable=broad-except - # Cannot use AusTrakkaCxt.value here because there is no click context - if is_debug(os.getenv(AusTrakkaCxt.get_env_var_name(CxtKey.LOG_LEVEL), '')): + # Cannot use TrakkaCxt.value here because there is no click context + if is_debug(os.getenv(TrakkaCxt.get_env_var_name(CxtKey.LOG_LEVEL), '')): logger.exception(ex) else: logger.error(ex) diff --git a/austrakka/utils/__init__.py b/trakka/utils/__init__.py similarity index 100% rename from austrakka/utils/__init__.py rename to trakka/utils/__init__.py diff --git a/austrakka/utils/api.py b/trakka/utils/api.py similarity index 88% rename from austrakka/utils/api.py rename to trakka/utils/api.py index a03a7cea..35fe1ef5 100644 --- a/austrakka/utils/api.py +++ b/trakka/utils/api.py @@ -10,13 +10,13 @@ from httpx import HTTPStatusError import httpx -from austrakka.utils.exceptions import FailedResponseException -from austrakka.utils.exceptions import UnknownResponseException -from austrakka.utils.exceptions import UnauthorizedException -from austrakka.utils.output import log_response -from austrakka.utils.context import CxtKey -from austrakka.utils.context import AusTrakkaCxt -from austrakka import __version__ +from trakka.utils.exceptions import FailedResponseException +from trakka.utils.exceptions import UnknownResponseException +from trakka.utils.exceptions import UnauthorizedException +from trakka.utils.output import log_response +from trakka.utils.context import CxtKey +from trakka.utils.context import TrakkaCxt +from trakka import __version__ CONTENT_TYPE_JSON = 'application/json' CONTENT_TYPE_MULTIPART = 'multipart/form-data; charset=utf-8; boundary=+++' @@ -28,9 +28,9 @@ def _get_default_headers( ) -> Dict: default_headers = { 'Content-Type': content_type, - 'Authorization': f'Bearer {AusTrakkaCxt.get_value(CxtKey.TOKEN)}', - 'User-Agent': f'austrakka/{__version__}', - 'X-Client-Session-ID': AusTrakkaCxt.get_value(CxtKey.SESSION_ID), + 'Authorization': f'Bearer {TrakkaCxt.get_value(CxtKey.TOKEN)}', + 'User-Agent': f'trakka/{__version__}', + 'X-Client-Session-ID': TrakkaCxt.get_value(CxtKey.SESSION_ID), } return default_headers @@ -64,7 +64,7 @@ def _get_data(body: Union[Dict, List] = None) -> str: def _get_url(path: str): - return f'{AusTrakkaCxt.get_value(CxtKey.URI)}/api/{path}' + return f'{TrakkaCxt.get_value(CxtKey.URI)}/api/{path}' def get_response(response: httpx.Response, log_resp: bool = False) -> Dict: @@ -81,9 +81,9 @@ def _get_client( ): return httpx.Client( headers=_get_default_headers(content_type), - verify=not AusTrakkaCxt.get_value(CxtKey.SKIP_CERT_VERIFY), + verify=not TrakkaCxt.get_value(CxtKey.SKIP_CERT_VERIFY), timeout=None, - http2=AusTrakkaCxt.get_value(CxtKey.USE_HTTP2), + http2=TrakkaCxt.get_value(CxtKey.USE_HTTP2), ) diff --git a/austrakka/utils/cmd_filter.py b/trakka/utils/cmd_filter.py similarity index 63% rename from austrakka/utils/cmd_filter.py rename to trakka/utils/cmd_filter.py index ba2c1cd4..e862fcc8 100644 --- a/austrakka/utils/cmd_filter.py +++ b/trakka/utils/cmd_filter.py @@ -1,11 +1,12 @@ import os AUSTRAKKA_ADMIN = 'austrakka-admin' +TRAKKA_ADMIN = 'admin' def show_admin_cmds(): cmd_set = os.getenv('AT_CMD_SET') - return cmd_set and cmd_set.lower() == AUSTRAKKA_ADMIN + return cmd_set and cmd_set.lower() in [AUSTRAKKA_ADMIN, TRAKKA_ADMIN] def hide_admin_cmds(): diff --git a/austrakka/utils/config.py b/trakka/utils/config.py similarity index 100% rename from austrakka/utils/config.py rename to trakka/utils/config.py diff --git a/austrakka/utils/context.py b/trakka/utils/context.py similarity index 92% rename from austrakka/utils/context.py rename to trakka/utils/context.py index b859d605..c0f8d606 100644 --- a/austrakka/utils/context.py +++ b/trakka/utils/context.py @@ -2,7 +2,7 @@ from click import get_current_context -from austrakka.utils.exceptions import AusTrakkaCliException +from trakka.utils.exceptions import TrakkaCliException CLI_PREFIX = 'AT' @@ -22,7 +22,7 @@ class CxtKey(Enum): TIMEZONE = 'timezone' -class AusTrakkaCxt: +class TrakkaCxt: """ Provides helper methods to deal with top-level options and environment variables """ @@ -38,7 +38,7 @@ def get_value(ctx_key: CxtKey): try: return get_current_context().parent.context[ctx_key.value] except RuntimeError as ex: - raise AusTrakkaCliException( + raise TrakkaCliException( f"Error accessing CLI context for key {ctx_key.name}." + "Context may not be active, or key does not exist." ) from ex diff --git a/austrakka/utils/datetimes.py b/trakka/utils/datetimes.py similarity index 92% rename from austrakka/utils/datetimes.py rename to trakka/utils/datetimes.py index 0ba724a3..11f585f5 100644 --- a/austrakka/utils/datetimes.py +++ b/trakka/utils/datetimes.py @@ -3,8 +3,8 @@ from loguru import logger import pandas as pd -from austrakka.utils.misc import logger_wraps -from austrakka.utils.context import AusTrakkaCxt, CxtKey +from trakka.utils.misc import logger_wraps +from trakka.utils.context import TrakkaCxt, CxtKey ORIGINAL_TIMEZONE = 'original' LOCAL_TIMEZONE = 'local' @@ -20,7 +20,7 @@ def parse_timezone(timezone_str: str = None): If timezone_str is None, will get the current context value. """ if timezone_str is None: - timezone_str = AusTrakkaCxt.get_value(CxtKey.TIMEZONE) + timezone_str = TrakkaCxt.get_value(CxtKey.TIMEZONE) if timezone_str.lower() == LOCAL_TIMEZONE: return datetime.now().astimezone().tzinfo @@ -48,7 +48,7 @@ def dt_format_and_convert(dt_series: pd.Series) -> pd.Series: "will not format or convert timezone.") return dt_series - timezone_str = AusTrakkaCxt.get_value(CxtKey.TIMEZONE) + timezone_str = TrakkaCxt.get_value(CxtKey.TIMEZONE) if timezone_str==ORIGINAL_TIMEZONE: # No timezone conversion requested but original string may have tz info return result.dt.strftime(DT_FORMAT_WITH_TZ) diff --git a/austrakka/utils/enums/__init__.py b/trakka/utils/enums/__init__.py similarity index 100% rename from austrakka/utils/enums/__init__.py rename to trakka/utils/enums/__init__.py diff --git a/austrakka/utils/enums/api.py b/trakka/utils/enums/api.py similarity index 100% rename from austrakka/utils/enums/api.py rename to trakka/utils/enums/api.py diff --git a/austrakka/utils/enums/countries.py b/trakka/utils/enums/countries.py similarity index 100% rename from austrakka/utils/enums/countries.py rename to trakka/utils/enums/countries.py diff --git a/austrakka/utils/enums/metadata.py b/trakka/utils/enums/metadata.py similarity index 100% rename from austrakka/utils/enums/metadata.py rename to trakka/utils/enums/metadata.py diff --git a/austrakka/utils/enums/privilege_level.py b/trakka/utils/enums/privilege_level.py similarity index 100% rename from austrakka/utils/enums/privilege_level.py rename to trakka/utils/enums/privilege_level.py diff --git a/austrakka/utils/enums/seq.py b/trakka/utils/enums/seq.py similarity index 95% rename from austrakka/utils/enums/seq.py rename to trakka/utils/enums/seq.py index 7f827fd3..b6355838 100644 --- a/austrakka/utils/enums/seq.py +++ b/trakka/utils/enums/seq.py @@ -1,7 +1,7 @@ from enum import Enum from typing import Optional -from austrakka.utils.exceptions import SeqTypeConversionException +from trakka.utils.exceptions import SeqTypeConversionException # These enum values give the strings passed to the API to specify types diff --git a/austrakka/utils/enums/states.py b/trakka/utils/enums/states.py similarity index 100% rename from austrakka/utils/enums/states.py rename to trakka/utils/enums/states.py diff --git a/austrakka/utils/enums/view_type.py b/trakka/utils/enums/view_type.py similarity index 100% rename from austrakka/utils/enums/view_type.py rename to trakka/utils/enums/view_type.py diff --git a/austrakka/utils/exceptions.py b/trakka/utils/exceptions.py similarity index 76% rename from austrakka/utils/exceptions.py rename to trakka/utils/exceptions.py index bcac6a47..c607f674 100644 --- a/austrakka/utils/exceptions.py +++ b/trakka/utils/exceptions.py @@ -1,9 +1,9 @@ -from austrakka.utils.enums.api import RESPONSE_TYPE -from austrakka.utils.enums.api import RESPONSE_TYPE_ERROR -from austrakka.utils.enums.api import RESPONSE_TYPE_SUCCESS -from austrakka.utils.enums.api import RESPONSE_TYPE_WARNING -from austrakka.utils.enums.api import RESPONSE_MESSAGES -from austrakka.utils.enums.api import RESPONSE_MESSAGE +from trakka.utils.enums.api import RESPONSE_TYPE +from trakka.utils.enums.api import RESPONSE_TYPE_ERROR +from trakka.utils.enums.api import RESPONSE_TYPE_SUCCESS +from trakka.utils.enums.api import RESPONSE_TYPE_WARNING +from trakka.utils.enums.api import RESPONSE_MESSAGES +from trakka.utils.enums.api import RESPONSE_MESSAGE class UnknownResponseException(Exception): pass @@ -42,7 +42,7 @@ class IncorrectHashException(Exception): pass -class AusTrakkaCliException(Exception): +class TrakkaCliException(Exception): pass diff --git a/austrakka/utils/fs.py b/trakka/utils/fs.py similarity index 96% rename from austrakka/utils/fs.py rename to trakka/utils/fs.py index 5eab50fb..e05e8c1f 100644 --- a/austrakka/utils/fs.py +++ b/trakka/utils/fs.py @@ -2,7 +2,7 @@ import os from dataclasses import dataclass -from austrakka.utils.exceptions import IncorrectHashException +from trakka.utils.exceptions import IncorrectHashException @dataclass diff --git a/austrakka/utils/helpers/__init__.py b/trakka/utils/helpers/__init__.py similarity index 100% rename from austrakka/utils/helpers/__init__.py rename to trakka/utils/helpers/__init__.py diff --git a/austrakka/utils/helpers/definition.py b/trakka/utils/helpers/definition.py similarity index 53% rename from austrakka/utils/helpers/definition.py rename to trakka/utils/helpers/definition.py index c7d039bf..4d7b24f2 100644 --- a/austrakka/utils/helpers/definition.py +++ b/trakka/utils/helpers/definition.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import JOB_DEFINITION_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import JOB_DEFINITION_PATH def get_definition_by_name(name: str): diff --git a/austrakka/utils/helpers/fieldtype.py b/trakka/utils/helpers/fieldtype.py similarity index 55% rename from austrakka/utils/helpers/fieldtype.py rename to trakka/utils/helpers/fieldtype.py index 319f1e01..a92de927 100644 --- a/austrakka/utils/helpers/fieldtype.py +++ b/trakka/utils/helpers/fieldtype.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import METADATA_COLUMN_TYPE_V2_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import METADATA_COLUMN_TYPE_V2_PATH def get_fieldtype_by_name_v2(name: str): diff --git a/austrakka/utils/helpers/groups.py b/trakka/utils/helpers/groups.py similarity index 76% rename from austrakka/utils/helpers/groups.py rename to trakka/utils/helpers/groups.py index 39bfe176..9da29723 100644 --- a/austrakka/utils/helpers/groups.py +++ b/trakka/utils/helpers/groups.py @@ -1,8 +1,8 @@ import pandas as pd -from austrakka.utils.api import api_get -from austrakka.utils.output import print_dataframe -from austrakka.utils.paths import GROUP_PATH +from trakka.utils.api import api_get +from trakka.utils.output import print_dataframe +from trakka.utils.paths import GROUP_PATH def get_group_by_name(name: str): diff --git a/austrakka/utils/helpers/orgs.py b/trakka/utils/helpers/orgs.py similarity index 53% rename from austrakka/utils/helpers/orgs.py rename to trakka/utils/helpers/orgs.py index 173ed938..a26e9fa0 100644 --- a/austrakka/utils/helpers/orgs.py +++ b/trakka/utils/helpers/orgs.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import ORG_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import ORG_PATH def get_org_by_abbrev(abbrev: str): diff --git a/austrakka/utils/helpers/output.py b/trakka/utils/helpers/output.py similarity index 93% rename from austrakka/utils/helpers/output.py rename to trakka/utils/helpers/output.py index 933cc51d..e0b401cd 100644 --- a/austrakka/utils/helpers/output.py +++ b/trakka/utils/helpers/output.py @@ -1,9 +1,9 @@ from typing import Dict from loguru import logger -from austrakka.utils.api import api_get -from austrakka.utils.misc import logger_wraps -from austrakka.utils.output import print_dataframe, read_pd +from trakka.utils.api import api_get +from trakka.utils.misc import logger_wraps +from trakka.utils.output import print_dataframe, read_pd @logger_wraps() def call_get_and_print( diff --git a/austrakka/utils/helpers/plots.py b/trakka/utils/helpers/plots.py similarity index 55% rename from austrakka/utils/helpers/plots.py rename to trakka/utils/helpers/plots.py index f23efee6..780084a6 100644 --- a/austrakka/utils/helpers/plots.py +++ b/trakka/utils/helpers/plots.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import PLOT_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import PLOT_PATH def get_plot_by_abbrev(abbrev: str): diff --git a/austrakka/utils/helpers/project.py b/trakka/utils/helpers/project.py similarity index 53% rename from austrakka/utils/helpers/project.py rename to trakka/utils/helpers/project.py index 9b1711d7..7792e5a0 100644 --- a/austrakka/utils/helpers/project.py +++ b/trakka/utils/helpers/project.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import PROJECT_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import PROJECT_PATH def get_project_by_abbrev(abbrev: str): diff --git a/austrakka/utils/helpers/share.py b/trakka/utils/helpers/share.py similarity index 100% rename from austrakka/utils/helpers/share.py rename to trakka/utils/helpers/share.py diff --git a/austrakka/utils/helpers/tree.py b/trakka/utils/helpers/tree.py similarity index 55% rename from austrakka/utils/helpers/tree.py rename to trakka/utils/helpers/tree.py index 489bf99b..963666c7 100644 --- a/austrakka/utils/helpers/tree.py +++ b/trakka/utils/helpers/tree.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import TREE_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import TREE_PATH def get_tree_by_abbrev(abbrev: str): diff --git a/austrakka/utils/helpers/upload.py b/trakka/utils/helpers/upload.py similarity index 79% rename from austrakka/utils/helpers/upload.py rename to trakka/utils/helpers/upload.py index c6204458..109303aa 100644 --- a/austrakka/utils/helpers/upload.py +++ b/trakka/utils/helpers/upload.py @@ -1,9 +1,9 @@ from loguru import logger -from austrakka.utils.fs import verify_hash_single, FileHash -from austrakka.utils.fs import verify_hash_dataset_job -from austrakka.utils.misc import logger_wraps -from austrakka.utils.api import api_post_multipart_raw, get_response +from trakka.utils.fs import verify_hash_single, FileHash +from trakka.utils.fs import verify_hash_dataset_job +from trakka.utils.misc import logger_wraps +from trakka.utils.api import api_post_multipart_raw, get_response @logger_wraps() diff --git a/austrakka/utils/helpers/users.py b/trakka/utils/helpers/users.py similarity index 53% rename from austrakka/utils/helpers/users.py rename to trakka/utils/helpers/users.py index a3911789..854e8e3a 100644 --- a/austrakka/utils/helpers/users.py +++ b/trakka/utils/helpers/users.py @@ -1,5 +1,5 @@ -from austrakka.utils.api import api_get -from austrakka.utils.paths import USER_PATH +from trakka.utils.api import api_get +from trakka.utils.paths import USER_PATH def get_user(user_id: str): diff --git a/austrakka/utils/http.py b/trakka/utils/http.py similarity index 100% rename from austrakka/utils/http.py rename to trakka/utils/http.py diff --git a/austrakka/utils/logger.py b/trakka/utils/logger.py similarity index 96% rename from austrakka/utils/logger.py rename to trakka/utils/logger.py index dbab4313..c854c0e5 100644 --- a/austrakka/utils/logger.py +++ b/trakka/utils/logger.py @@ -39,7 +39,7 @@ def setup_logger(log_level: str, log: str): # pylint: disable=consider-using-with log_file = NamedTemporaryFile( mode='w', - prefix='austrakka-cli-output-', + prefix='trakka-cli-output-', suffix='.log', delete=False ) diff --git a/austrakka/utils/misc.py b/trakka/utils/misc.py similarity index 84% rename from austrakka/utils/misc.py rename to trakka/utils/misc.py index 9ea91e02..d0959d95 100644 --- a/austrakka/utils/misc.py +++ b/trakka/utils/misc.py @@ -4,8 +4,8 @@ import click from loguru import logger -from austrakka.components.auth import auth -from austrakka.utils.context import CxtKey +from trakka.components.auth import auth +from trakka.utils.context import CxtKey HELP_OPTS = ['-h', '--help'] @@ -13,17 +13,17 @@ MISSING_TOKEN_HELP = '''Error: Environment variable AT_TOKEN is not set. This value can be obtained by running the following command: -austrakka auth user''' +trakka auth user''' MISSING_URI_HELP = '''Error: Environment variable AT_URI is not set. Please contact a Trakka admin if you do not have this value.''' -class AusTrakkaCliTopLevel(click.Group): +class TrakkaCliTopLevel(click.Group): # pylint: disable=super-with-arguments def parse_args(self, ctx, args): try: - return super(AusTrakkaCliTopLevel, self).parse_args(ctx, args) + return super(TrakkaCliTopLevel, self).parse_args(ctx, args) except click.MissingParameter: # if getting help or trying to authorise, ignore top level params if not any(i in HELP_OPTS for i in args) and args[0] != auth.name: @@ -31,12 +31,12 @@ def parse_args(self, ctx, args): # remove the required params so that help can display for param in self.params: param.required = False - return super(AusTrakkaCliTopLevel, self).parse_args(ctx, args) + return super(TrakkaCliTopLevel, self).parse_args(ctx, args) # pylint: disable=inconsistent-return-statements def __call__(self, *args, **kwargs): try: - return super(AusTrakkaCliTopLevel, self).__call__( + return super(TrakkaCliTopLevel, self).__call__( *args, standalone_mode=False, **kwargs) except click.MissingParameter as exc: # If there is a missing top level parameter (eg. URI or TOKEN) diff --git a/austrakka/utils/option_utils.py b/trakka/utils/option_utils.py similarity index 94% rename from austrakka/utils/option_utils.py rename to trakka/utils/option_utils.py index 8d9bba74..b053d5fe 100644 --- a/austrakka/utils/option_utils.py +++ b/trakka/utils/option_utils.py @@ -3,7 +3,7 @@ import click -from austrakka.utils.misc import logger_wraps +from trakka.utils.misc import logger_wraps def create_option(*param_decls: str, **attrs: t.Any): @@ -16,7 +16,7 @@ def inner_func(func): return click.option( *param_decls, - cls=AusTrakkaCliOption, + cls=TrakkaCliOption, show_default=True, **attrs)(func) @@ -35,13 +35,13 @@ def _get_custom_help_record(orig_help, multiple): return orig_help -class AusTrakkaCliOption(click.Option): +class TrakkaCliOption(click.Option): def get_help_record(self, ctx): orig_help = super().get_help_record(ctx) return _get_custom_help_record(orig_help, self.multiple) -class MutuallyExclusiveOption(AusTrakkaCliOption): +class MutuallyExclusiveOption(TrakkaCliOption): def __init__(self, *args, **kwargs): self.mutually_exclusive = set(kwargs.pop('mutually_exclusive', [])) help_text = kwargs.get('help', '') @@ -66,7 +66,7 @@ def handle_parse_result(self, ctx, opts, args): ) -class RequiredMutuallyExclusiveOption(AusTrakkaCliOption): +class RequiredMutuallyExclusiveOption(TrakkaCliOption): def __init__(self, *args, **kwargs): self.mutually_exclusive = set(kwargs.pop('mutually_exclusive', [])) help_text = kwargs.get('help', '') diff --git a/austrakka/utils/options.py b/trakka/utils/options.py similarity index 98% rename from austrakka/utils/options.py rename to trakka/utils/options.py index a3f7a125..d1470d95 100644 --- a/austrakka/utils/options.py +++ b/trakka/utils/options.py @@ -3,19 +3,19 @@ import click -from austrakka.utils.enums.privilege_level import ( +from trakka.utils.enums.privilege_level import ( TRAKKA_ADMIN_LEVEL, ADMIN_LEVEL, USER_LEVEL) -from austrakka.utils.enums.seq import SeqType -from austrakka.utils.enums.view_type import MORE, COMPACT, FULL -from austrakka.utils.option_utils import \ +from trakka.utils.enums.seq import SeqType +from trakka.utils.enums.view_type import MORE, COMPACT, FULL +from trakka.utils.option_utils import \ create_option, \ MutuallyExclusiveOption, \ RequiredMutuallyExclusiveOption -from austrakka import __prog_name__ as PROG_NAME -from austrakka.utils.privilege import ALL_RESOURCES +from trakka import __prog_name__ as PROG_NAME +from trakka.utils.privilege import ALL_RESOURCES def opt_abbrev(**attrs: t.Any): @@ -582,7 +582,7 @@ def opt_is_geo(is_update=False, **attrs: t.Any): ) -def opt_is_austrakka_process(**attrs: t.Any): +def opt_is_trakka_process(**attrs: t.Any): defaults = { 'help': 'Determines if the user is a process' } diff --git a/austrakka/utils/output.py b/trakka/utils/output.py similarity index 93% rename from austrakka/utils/output.py rename to trakka/utils/output.py index ad79abf6..de20f2bb 100644 --- a/austrakka/utils/output.py +++ b/trakka/utils/output.py @@ -9,16 +9,16 @@ from tabulate import tabulate from loguru import logger -from austrakka.utils.misc import logger_wraps -from austrakka.utils.datetimes import dt_format_and_convert -from austrakka.utils.enums.api import RESPONSE_TYPE -from austrakka.utils.enums.api import RESPONSE_TYPE_ERROR -from austrakka.utils.enums.api import RESPONSE_TYPE_SUCCESS -from austrakka.utils.enums.api import RESPONSE_TYPE_WARNING -from austrakka.utils.enums.api import RESPONSE_DATA -from austrakka.utils.enums.api import RESPONSE_MESSAGES -from austrakka.utils.enums.api import RESPONSE_MESSAGE -from austrakka.utils.enums.view_type import COMPACT, MORE, FULL +from trakka.utils.misc import logger_wraps +from trakka.utils.datetimes import dt_format_and_convert +from trakka.utils.enums.api import RESPONSE_TYPE +from trakka.utils.enums.api import RESPONSE_TYPE_ERROR +from trakka.utils.enums.api import RESPONSE_TYPE_SUCCESS +from trakka.utils.enums.api import RESPONSE_TYPE_WARNING +from trakka.utils.enums.api import RESPONSE_DATA +from trakka.utils.enums.api import RESPONSE_MESSAGES +from trakka.utils.enums.api import RESPONSE_MESSAGE +from trakka.utils.enums.view_type import COMPACT, MORE, FULL _FORMAT_PREFIX = '_format_' _EXTENSION_PREFIX = '_extension_' diff --git a/austrakka/utils/paths.py b/trakka/utils/paths.py similarity index 100% rename from austrakka/utils/paths.py rename to trakka/utils/paths.py diff --git a/austrakka/utils/privilege.py b/trakka/utils/privilege.py similarity index 78% rename from austrakka/utils/privilege.py rename to trakka/utils/privilege.py index 0f3a3e59..210b47c8 100644 --- a/austrakka/utils/privilege.py +++ b/trakka/utils/privilege.py @@ -1,8 +1,8 @@ -from austrakka.utils.paths import ORG_V2_PATH -from austrakka.utils.paths import PROFORMA_V2_PATH -from austrakka.utils.paths import PROJECT_PATH -from austrakka.utils.paths import TENANT_PATH -from austrakka.utils.paths import USER_V2_PATH +from trakka.utils.paths import ORG_V2_PATH +from trakka.utils.paths import PROFORMA_V2_PATH +from trakka.utils.paths import PROJECT_PATH +from trakka.utils.paths import TENANT_PATH +from trakka.utils.paths import USER_V2_PATH TENANT_RESOURCE = 'Tenant' ORG_RESOURCE = 'Organisation' diff --git a/austrakka/utils/retry.py b/trakka/utils/retry.py similarity index 86% rename from austrakka/utils/retry.py rename to trakka/utils/retry.py index c494758b..63934bc5 100644 --- a/austrakka/utils/retry.py +++ b/trakka/utils/retry.py @@ -1,8 +1,8 @@ from time import sleep from loguru import logger -from austrakka.utils.exceptions import FailedResponseException -from austrakka.utils.exceptions import UnknownResponseException +from trakka.utils.exceptions import FailedResponseException +from trakka.utils.exceptions import UnknownResponseException def retry(func, retries, desc, delay=0): succeeded = False diff --git a/austrakka/utils/subcommands/__init__.py b/trakka/utils/subcommands/__init__.py similarity index 100% rename from austrakka/utils/subcommands/__init__.py rename to trakka/utils/subcommands/__init__.py diff --git a/austrakka/utils/version.py b/trakka/utils/version.py similarity index 85% rename from austrakka/utils/version.py rename to trakka/utils/version.py index dcbef1ec..4ba4846b 100644 --- a/austrakka/utils/version.py +++ b/trakka/utils/version.py @@ -2,16 +2,12 @@ import requests from semver import compare, VersionInfo from loguru import logger -from austrakka import __prog_name__ as PROG_NAME +from trakka import __prog_name__ as PROG_NAME PYPI_PACKAGE_URI = f'https://pypi.org/pypi/{PROG_NAME}/json' def check_version(current): - # Add this back in once we're ready to start moving users to trakka - # if PROG_NAME == "austrakka": - # logger.warning("The 'austrakka' CLI is deprecated. Please install 'trakka'.") - try: resp = requests.get(PYPI_PACKAGE_URI, timeout=10) releases = list(resp.json()['releases'].keys()) diff --git a/your_file.txt b/your_file.txt deleted file mode 100644 index e69de29b..00000000