Remove OneSeismic (#114)

equinor · Jan 30, 2023 · 45abe11 · 45abe11
1 parent 8ca646b
commit 45abe11
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 68 deletions.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -4,7 +4,6 @@ pytest>=6.1.1
 deprecation
 sumo-wrapper-python @ git+https://github.com/equinor/sumo-wrapper-python.git@master#egg=sumo-wrapper-python
 xtgeo
-oneseismic
 azure-core
 pyarrow; python_version > "3.6.1"
 # ert
diff --git a/src/fmu/sumo/uploader/_fileondisk.py b/src/fmu/sumo/uploader/_fileondisk.py
@@ -12,10 +12,6 @@
 import logging
 import hashlib
 import base64
-import tempfile
-import json
-import oneseismic.scan.__main__ as scan
-import oneseismic.upload.__main__ as upload
 
 import yaml
 
@@ -97,20 +93,12 @@ def __init__(self, path: str, metadata_path=None, verbosity="INFO"):
 
         self.metadata["_sumo"] = {}
 
-        # if self.metadata["class"] == "seismic":
-        if self.metadata["data"]["format"] == "segy":
-            self.metadata["_sumo"]["blob_size"] = 0
-            self.manifest = json.loads(scan.main([self.path]))
-            self.metadata["_sumo"]["blob_sha256"] = self.manifest["guid"]
-            self.byte_string = None
-
-        else:
-            self.byte_string = file_to_byte_string(path)
-            self.metadata["_sumo"]["blob_size"] = len(self.byte_string)
-            digester = hashlib.md5(self.byte_string)
-            self.metadata["_sumo"]["blob_md5"] = base64.b64encode(
-                digester.digest()
-            ).decode("utf-8")
+        self.byte_string = file_to_byte_string(path)
+        self.metadata["_sumo"]["blob_size"] = len(self.byte_string)
+        digester = hashlib.md5(self.byte_string)
+        self.metadata["_sumo"]["blob_md5"] = base64.b64encode(
+            digester.digest()
+        ).decode("utf-8")
 
     def __repr__(self):
         if not self.metadata:
@@ -227,30 +215,13 @@ def upload_to_sumo(self, sumo_parent_id, sumo_connection):
         for i in backoff:
             logger.debug("backoff in inner loop is %s", str(i))
             try:
-                # if self.metadata["class"] == "seismic":
-                if self.metadata["data"]["format"] == "segy":
-                    with tempfile.NamedTemporaryFile(mode="w+") as temp:
-                        json.dump(self.manifest, temp)
-                        temp.flush()
-                        args = [
-                            "--output-auth-method",
-                            "connection-string",
-                            "--output-connection-string",
-                            "BlobEndpoint=" + response.json()["blob_url"],
-                            temp.name,
-                            self.path,
-                        ]
-                        upload.main(args)
-                    upload_response["status_code"] = 200
-                    upload_response["text"] = "File hopefully uploaded to Oneseimic"
-                else:
-                    response = self._upload_byte_string(
-                        sumo_connection=sumo_connection,
-                        object_id=self.sumo_object_id,
-                        blob_url=blob_url,
-                    )
-                    upload_response["status_code"] = response.status_code
-                    upload_response["text"] = response.text
+                response = self._upload_byte_string(
+                    sumo_connection=sumo_connection,
+                    object_id=self.sumo_object_id,
+                    blob_url=blob_url,
+                )
+                upload_response["status_code"] = response.status_code
+                upload_response["text"] = response.text
 
                 _t1_blob = time.perf_counter()
 
@@ -264,7 +235,7 @@ def upload_to_sumo(self, sumo_parent_id, sumo_connection):
 
             except ResourceExistsError as err:
                 upload_response["status_code"] = 200
-                upload_response["text"] = "File hopefully uploaded to Oneseimic"
+                upload_response["text"] = "File hopefully uploaded"
                 _t1_blob = time.perf_counter()
 
                 result["blob_upload_response_status_code"] = upload_response[

diff --git a/tests/test_uploader.py b/tests/test_uploader.py
@@ -200,30 +200,6 @@ def test_wrong_metadata(token):
     assert total == 2
 
 
-# TEMPORARILY REMOVE SEISMIC TEST PENDING SUMO SUPPORT
-
-# def test_seismic_file(token):
-#     """Upload one seimic file to Sumo. Assert that it is there."""
-#     sumo_connection = uploader.SumoConnection(env=ENV, token=token)
-#     e = uploader.CaseOnDisk(
-#         case_metadata_path="tests/data/test_case_080/case.yml",
-#         sumo_connection=sumo_connection,
-#     )
-#     e.register()
-#     e.add_files("tests/data/test_case_080/seismic.segy")
-
-#     # Assert children is on Sumo
-
-#     e.upload()
-#     time.sleep(4)
-#     query = f"{e.fmu_case_uuid}"
-#     search_results = sumo_connection.api.get(
-#         "/search", query=query, size=100, **{"from": 0}
-#     )
-#     total = search_results.get("hits").get("total").get("value")
-#     assert total == 3
-
-
 def test_teardown(token):
     """Teardown all testdata"""
     sumo_connection = uploader.SumoConnection(env=ENV, token=token)