sumo-wrapper-python 1.1.0__tar.gz → 1.1.2__tar.gz

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/.github/workflows/build_docs.yaml

@@ -12,6 +12,8 @@ on:
 jobs:
   build_pywheels:
     name: Build docs with Python ${{ matrix.python-version }} on ${{ matrix.os }}
+    permissions:
+      contents: read
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/.github/workflows/linting.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   ruff-check:
     name: Run ruff lint and format checks
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
 
     steps:

sumo_wrapper_python-1.1.2/.readthedocs.yaml

@@ -0,0 +1,16 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+
+sphinx:
+  configuration: docs/conf.py

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/CONTRIBUTING.md

@@ -11,18 +11,18 @@ This is how you should do it:
 
 Use our [issue list](../../issues) to report a **bug** or **propose a new feature**, including
 
-### Reporting a **bug report**  
+### Reporting a **bug report**
 - A quick summary and/or background
 - Steps to reproduce
 - What actually happens
 
-### Adding a **feature request**  
+### Adding a **feature request**
 - Brief description of the feature
 - What problem/issue will this solve
 - A sort of Definition of Done - "How should it look when finished"
 
-### When submitting a fix using a Pull Request (PR)  
-- Fork this repository from GitHub  
-- After you have made the changes, create a pull request (PR)  
+### When submitting a fix using a Pull Request (PR)
+- Fork this repository from GitHub
+- After you have made the changes, create a pull request (PR)
 
-We will review the pull request and if it is appropriate and there are no clashes or vulnerabilities, it will be merged to the main code.
+We will review the pull request and if it is appropriate and there are no clashes or vulnerabilities, it will be merged to the main code.

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sumo-wrapper-python
-Version: 1.1.0
+Version: 1.1.2
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/src/sumo/wrapper/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.0'
-__version_tuple__ = version_tuple = (1, 1, 0)
+__version__ = version = '1.1.2'
+__version_tuple__ = version_tuple = (1, 1, 2)

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/src/sumo/wrapper/sumo_client.py

@@ -227,6 +227,11 @@ class SumoClient:
                 path,
             )
             is not None
+            or re.match(
+                r"^/tasks\('[0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}'\)/result$",  # noqa: E501
+                path,
+            )
+            is not None
         ):
             follow_redirects = True
 
@@ -542,6 +547,11 @@ class SumoClient:
                 path,
             )
             is not None
+            or re.match(
+                r"^/tasks\('[0-9a-fA-F-]{8}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{4}-[0-9a-fA-F-]{12}'\)/result$",  # noqa: E501
+                path,
+            )
+            is not None
         ):
             follow_redirects = True
 

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/src/sumo_wrapper_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sumo-wrapper-python
-Version: 1.1.0
+Version: 1.1.2
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/tests/test_sumo_thin_client.py

@@ -33,18 +33,6 @@ def _upload_blob(conn, blob, url=None, object_id=None):
     return response
 
 
-def _get_blob_uri(conn, object_id):
-    response = conn.get(f"/objects('{object_id}')/blob/authuri")
-
-    print("Blob save " + str(response.status_code), flush=True)
-    if not 200 <= response.status_code < 202:
-        raise Exception(
-            f"get blob uri for {object_id}"
-            f" returned {response.text} {response.status_code}"
-        )
-    return response
-
-
 def _download_object(conn, object_id):
     json = conn.get(f"/objects('{object_id}')").json()
 
@@ -67,12 +55,6 @@ def _delete_object(conn, object_id):
     return response
 
 
-class ValueKeeper:
-    """Class for keeping/passing values between tests"""
-
-    pass
-
-
 """ TESTS """
 
 
@@ -234,7 +216,7 @@ def test_upload_duplicate_ensemble(token):
     # time-to-live of 60 seconds. If there are multiple replicas
     # running, we might get the situation where we have just deleted
     # the case via one replica, then ask for the object from another
-    # replica which still has it ins cache. Thus, the magic value 61,
+    # replica which still has it in cache. Thus, the magic value 61,
     # below.
     sleep(61)
 

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/tests/testdata/case.yml

@@ -1,19 +1,19 @@
 # example YAML file for ensembles (a parent object in Sumo)
 
-$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.8.0/fmu_results.json
-version: "0.8.0" # including for REP and others to build logic on.
-source: fmu  # always included, and always this value if FMU made it. For quick identification for external consumers.
+$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.12.0/fmu_results.json
+version: "0.12.0" # including for REP and others to build logic on.
+source: fmu # always included, and always this value if FMU made it. For quick identification for external consumers.
 class: case
 fmu:
   case:
     name: TestCase from fmu.sumo
-    uuid: 8bb56d60-8758-481a-89a4-6bac8561d38e # (pseudo-)random valid uuid4xs
+    uuid: 8bb56d60-8758-481a-89a4-6bac8561d38e # (pseudo-)random valid uuid4xs, this is re-generated in tests.
     user:
       id: testuser # $USER from ERT
     description:
       - yet other detailed description
       - optional
-    restart_from: 00000000-0000-0000-0000-000000000000   # fmu.iteration.uuid for another iteration/case
+    restart_from: 00000000-0000-0000-0000-000000000000 # fmu.ensemble.uuid for another ensemble/case
   model:
     name: ff
     revision: 21.0.0.dev
@@ -26,7 +26,7 @@ fmu:
 
 access:
   asset:
-    name: Drogon  # adding level to make room for unique ID in the future
+    name: Drogon # adding level to make room for unique ID in the future
 
 # ensemble objects have no ssdl details
 
@@ -54,11 +54,11 @@ masterdata:
       uuid: 12345678-1234-1234-1234-123456789012
 
 tracklog:
-  - datetime: '2020-10-28T14:28:02'
+  - datetime: '2020-10-28T14:28:02Z'
     user:
       id: testuser
     event: created
-  - datetime: '2020-10-28T14:46:14'
+  - datetime: '2020-10-28T14:46:14Z'
     user: 
       id: testuser
     event: updated

{sumo_wrapper_python-1.1.0 → sumo_wrapper_python-1.1.2}/tests/testdata/surface.yml

@@ -1,13 +1,13 @@
-$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.8.0/fmu_results.json
-version: "0.8.0" # including for REP and others to build logic on.
-source: fmu  # always included, and always this value if FMU made it. For quick identification for external consumers.
+$schema: https://main-fmu-schemas-dev.radix.equinor.com/schemas/0.12.0/fmu_results.json
+version: "0.12.0" # including for REP and others to build logic on.
+source: fmu # always included, and always this value if FMU made it. For quick identification for external consumers.
 
 tracklog:
-  - datetime: '2020-10-28T14:28:02'
+  - datetime: '2020-10-28T14:28:02Z'
     user:
       id: testuser
     event: created
-  - datetime: '2020-10-28T14:46:14'
+  - datetime: '2020-10-28T14:46:14Z'
     user: 
       id: testuser
     event: updated
@@ -24,10 +24,10 @@ fmu:
     description:
       - detailed description
       - optional
-  
+
   context:
     stage: "realization"
-  
+
   workflow: # not sure, but a reference to the workflow / job that made this. Making it expandable.
     reference: rms/structural_model
 
@@ -39,16 +39,19 @@ fmu:
     description:
       - yet other detailed description
       - optional
-    restart_from: 15ce3b84-766f-4c93-9050-b154861f9100   # fmu.iteration.uuid for another iteration/case
+    restart_from: 15ce3b84-766f-4c93-9050-b154861f9100 # fmu.ensemble.uuid for another ensemble/case
 
-  iteration:
+  ensemble:
     id: 0 # always an int, will be 0 for e.g. "pred"
-    uuid: 4b939310-34b1-4179-802c-49460bc0f799 # hash of case.uuid + iteration.id
+    uuid: 4b939310-34b1-4179-802c-49460bc0f799 # hash of case.uuid + ensemble.id
     name: "iter-0" # /"pred"
 
-  realization:  # could be expanded in the future?
+  entity:
+    uuid: dc2971e1-abae-4691-92fc-17fbd926461a
+
+  realization: # could be expanded in the future?
     id: 33
-    uuid: 29a15b21-ce13-471b-9a4a-0f791552aa51 # hash of case.uuid + iteration.uuid + realization.id
+    uuid: 29a15b21-ce13-471b-9a4a-0f791552aa51 # hash of case.uuid + ensemble.uuid + realization.id
     name: "realization-33"
     parameters: # directly pass parameters.txt. This is potentially a lot of content, only a stub is included here.
       SENSNAME: faultseal
@@ -61,28 +64,27 @@ fmu:
       FAULT_SEAL_SCALING: 0.1
       FWL_CENTRAL: 1677
     jobs: # directly pass jobs.json. This is a lot of content, only a stub is included here.
-      umask: '0002'
+      umask: "0002"
       DATA_ROOT: /some/path/20.4.0_20201106/ert/model
       anything: something
       something:
         anything: something
       global_update_path: {}
       jobList:
-      - name: MAKE_DIRECTORY
-        min_arg: 1
-        anything: something
+        - name: MAKE_DIRECTORY
+          min_arg: 1
+          anything: something
 
 file:
   relative_path: realization-33/iter-0/share/results/maps/volantis_gp_base--amplitude.gri # case-relative
   absolute_path: /some/absolute/path//realization-33/iter-0/share/results/maps/volantis_gp_base--amplitude.gri
-  checksum_md5: 0123456789abcdef0123456789abcdef  # checksum of the file, not the data.
+  checksum_md5: 0123456789abcdef0123456789abcdef # checksum of the file, not the data.
 
 data: # The data block describes the actual data (e.g. surface). Only present in data objects
-
   # if stratigraphic, name must match the strat column. This is the official name of this surface.
   name: volantis_top-volantis_base
-  stratigraphic: false  # if true, this is a stratigraphic surface found in the strat column
-  offset: 0.0  # to be used if a specific horizon is represented with an offset.
+  stratigraphic: false # if true, this is a stratigraphic surface found in the strat column
+  offset: 0.0 # to be used if a specific horizon is represented with an offset.
 
   top: # not required, but allowed
     name: volantis_gp_top
@@ -127,7 +129,7 @@ data: # The data block describes the actual data (e.g. surface). Only present in
     yinc: 25.0
     yflip: 1
     rotation: 30.000000834826057
-    undef: 1.0e+33  # Allow both number and string
+    undef: 1.0e+33 # Allow both number and string
   bbox:
     xmin: 456012.5003497944
     xmax: 467540.52762886323
@@ -181,10 +183,9 @@ masterdata:
     field:
       - identifier: DROGON
         uuid: 00000000-0000-0000-0000-000000000000
-    coordinate_system:  # changing from "coordinates" to clarify this is not content
+    coordinate_system: # changing from "coordinates" to clarify this is not content
       identifier: ST_WGS84_UTM37N_P32637
       uuid: ad214d85-dac7-19da-e053-c918a4889309
     stratigraphic_column:
       identifier: DROGON_2020
       uuid: 12345678-1234-1234-1234-123456789012
-

sumo_wrapper_python-1.1.0/.readthedocs.yaml

@@ -1,16 +0,0 @@
-version: 2
-
-build:
-    os: ubuntu-22.04
-    tools:
-        python: "3.10"
-
-python:
-    install:
-        - method: pip
-          path: .
-          extra_requirements:
-            - docs
-
-sphinx:
-    configuration: docs/conf.py