Skip to content

Commit 6755cd0

Browse files
authored
updates auth and task states enum (#22)
* updates auth and task states enum * updates deploy workflow * updated doc * Version upgrade 0.4.2 → 0.4.3
1 parent 89eec8a commit 6755cd0

File tree

11 files changed

+157
-78
lines changed

11 files changed

+157
-78
lines changed

.github/workflows/deploy.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: contains(github.ref, 'master')
1414
steps:
15-
- uses: actions/checkout@master
16-
- name: Set up lates Python 3
15+
- uses: actions/checkout@v2
16+
- name: Set up latest Python 3
1717
uses: actions/setup-python@v2
1818
with:
1919
python-version: '3.x'
@@ -26,14 +26,15 @@ jobs:
2626
- name: Build a binary wheel and a source tarball
2727
run: python setup.py sdist bdist_wheel
2828
- name: Publish distribution 📦 to *Test* PyPI
29-
uses: pypa/gh-action-pypi-publish@master
29+
uses: pypa/gh-action-pypi-publish@release/v1
3030
with:
3131
user: __token__
3232
password: ${{ secrets.TEST_PYPI_TOKEN }}
3333
repository_url: https://test.pypi.org/legacy/
34+
verbose: true
3435
- if: startsWith(github.ref, 'refs/tags')
3536
name: Publish distribution 📦 to PyPI
36-
uses: pypa/gh-action-pypi-publish@master
37+
uses: pypa/gh-action-pypi-publish@release/v1
3738
with:
3839
user: __token__
3940
password: ${{ secrets.PYPI_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TODO: activate when service is up and running in production
1414
Python client for osparc-simcore public web API
1515

1616
- API version: 0.3.0
17-
- Package version: 0.4.2
17+
- Package version: 0.4.3
1818
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
1919

2020
## Requirements

api/openapi.json

Lines changed: 51 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,12 @@
711711
}
712712
}
713713
}
714-
}
714+
},
715+
"security": [
716+
{
717+
"HTTPBasic": []
718+
}
719+
]
715720
}
716721
},
717722
"/v0/solvers/{solver_key}/releases/{version}/jobs/{job_id}:start": {
@@ -774,7 +779,12 @@
774779
}
775780
}
776781
}
777-
}
782+
},
783+
"security": [
784+
{
785+
"HTTPBasic": []
786+
}
787+
]
778788
}
779789
},
780790
"/v0/solvers/{solver_key}/releases/{version}/jobs/{job_id}:stop": {
@@ -837,7 +847,12 @@
837847
}
838848
}
839849
}
840-
}
850+
},
851+
"security": [
852+
{
853+
"HTTPBasic": []
854+
}
855+
]
841856
}
842857
},
843858
"/v0/solvers/{solver_key}/releases/{version}/jobs/{job_id}:inspect": {
@@ -900,7 +915,12 @@
900915
}
901916
}
902917
}
903-
}
918+
},
919+
"security": [
920+
{
921+
"HTTPBasic": []
922+
}
923+
]
904924
}
905925
},
906926
"/v0/solvers/{solver_key}/releases/{version}/jobs/{job_id}/outputs": {
@@ -963,7 +983,12 @@
963983
}
964984
}
965985
}
966-
}
986+
},
987+
"security": [
988+
{
989+
"HTTPBasic": []
990+
}
991+
]
967992
}
968993
}
969994
},
@@ -1013,13 +1038,7 @@
10131038
"description": "MD5 hash of the file's content [EXPERIMENTAL]"
10141039
}
10151040
},
1016-
"description": "Represents a file stored on the server side i.e. a unique reference to a file in the cloud.",
1017-
"example": {
1018-
"id": "f0e1fb11-208d-3ed2-b5ef-cab7a7398f78",
1019-
"filename": "Architecture-of-Scalable-Distributed-ETL-System-whitepaper.pdf",
1020-
"content_type": "application/pdf",
1021-
"checksum": "de47d0e1229aa2dfb80097389094eadd-1"
1022-
}
1041+
"description": "Represents a file stored on the server side i.e. a unique reference to a file in the cloud."
10231042
},
10241043
"Groups": {
10251044
"title": "Groups",
@@ -1171,7 +1190,8 @@
11711190
"enabled": true,
11721191
"input_file": {
11731192
"id": "0a3b2c56-dbcd-4871-b93b-d454b7883f9f",
1174-
"filename": "input.txt"
1193+
"filename": "input.txt",
1194+
"content_type": "text/plain"
11751195
}
11761196
}
11771197
}
@@ -1220,7 +1240,8 @@
12201240
"enabled": false,
12211241
"output_file": {
12221242
"id": "0a3b2c56-dbcd-4871-b93b-d454b7883f9f",
1223-
"filename": "sar_matrix.txt"
1243+
"filename": "sar_matrix.txt",
1244+
"content_type": "text/plain"
12241245
}
12251246
}
12261247
}
@@ -1266,6 +1287,13 @@
12661287
"description": "Timestamp at which the solver finished or killed execution or None if the event did not occur",
12671288
"format": "date-time"
12681289
}
1290+
},
1291+
"example": {
1292+
"job_id": "145beae4-a3a8-4fde-adbb-4e8257c2c083",
1293+
"state": "STARTED",
1294+
"progress": 3,
1295+
"submitted_at": "2021-04-01 07:15:54.631007",
1296+
"started_at": "2021-04-01 07:16:43.670610"
12691297
}
12701298
},
12711299
"Meta": {
@@ -1453,11 +1481,15 @@
14531481
"TaskStates": {
14541482
"title": "TaskStates",
14551483
"enum": [
1456-
"undefined",
1457-
"pending",
1458-
"running",
1459-
"success",
1460-
"failed"
1484+
"UNKNOWN",
1485+
"PUBLISHED",
1486+
"NOT_STARTED",
1487+
"PENDING",
1488+
"STARTED",
1489+
"RETRY",
1490+
"SUCCESS",
1491+
"FAILED",
1492+
"ABORTED"
14611493
],
14621494
"type": "string",
14631495
"description": "An enumeration."

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Python client for osparc-simcore public web API
99

1010
- API version: 0.3.0
11-
- Package version: 0.4.2
11+
- Package version: 0.4.3
1212
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
1313

1414
## Requirements

0 commit comments

Comments
 (0)