add deletion of app configs, debug updating of app configs

dsms/apps/config.py

@@ -15,6 +15,7 @@
 
 from dsms.apps.utils import (  # isort:skip
     _app_spec_exists,
+    _get_app_specification,
 )
 
 
@@ -142,6 +143,19 @@ def validate_specification(cls, self: "AppConfig") -> str:
                     f"Invalid yaml specification path: `{error.args[0]}`"
                 ) from error
             self.context.buffers.updated.update({self.name: self})
+        elif isinstance(self.specification, dict) and self.in_backend:
+            spec = _get_app_specification(self.name)
+            if (
+                not yaml.safe_load(spec) == self.specification
+                and self.name not in self.context.buffers.updated
+            ):
+                self.context.buffers.updated.update({self.name: self})
+        elif (
+            isinstance(self.specification, dict)
+            and not self.in_backend
+            and self.name not in self.context.buffers.updated
+        ):
+            self.context.buffers.updated.update({self.name: self})
         return self
 
     @property

dsms/apps/utils.py

@@ -26,7 +26,7 @@ def _app_spec_exists(name: str) -> bool:
 
 def _get_app_specification(appname) -> str:
     response = _perform_request(
-        f"knowledge/api/apps/argo/spec/{appname}",
+        f"api/knowledge/apps/argo/spec/{appname}",
         "get",
     )
     if not response.ok:

dsms/core/dsms.py

@@ -100,20 +100,23 @@ def __getitem__(self, key: str) -> "KItem":
         """Get KItem from remote DSMS instance."""
         return _get_kitem(key)
 
-    def __delitem__(self, kitem) -> None:
-        """Stage an KItem for the deletion.
+    def __delitem__(self, obj) -> None:
+        """Stage an KItem, KType or AppConfig for the deletion.
         WARNING: Changes only will take place after executing the `commit`-method
         """
 
-        from dsms.knowledge.kitem import (  # isort:skip
-            KItem,
-        )
+        from dsms import KItem, AppConfig, KType  # isort:skip
 
-        if not isinstance(kitem, KItem):
+        if isinstance(obj, KItem):
+            self.context.buffers.deleted.update({obj.id: obj})
+        elif isinstance(obj, AppConfig):
+            self.context.buffers.deleted.update({obj.name: obj})
+        elif isinstance(obj, KType):
+            raise NotImplementedError("Deletion of KTypes not available yet.")
+        else:
             raise TypeError(
-                f"Object must be of type {KItem}, not {type(kitem)}. "
+                f"Object must be of type {KItem}, {AppConfig} or {KType}, not {type(obj)}. "
             )
-        kitem.context.buffers.deleted.update({kitem.id: kitem})
 
     def commit(self) -> None:
         """Commit and empty the buffers of the KItems to the DSMS backend."""

dsms/knowledge/utils.py

@@ -372,6 +372,7 @@ def _upload_attachments(kitem: "KItem", attachment: "Attachment") -> None:
                 f"""Invalid content type of attachment with name
                 `{attachment.name}`: {type(attachment.content)}"""
             )
+        file.name = attachment.name
         upload_file = {"dataFile": file}
         response = _perform_request(
             f"api/knowledge/attachments/{kitem.id}",
@@ -610,9 +611,7 @@ def _commit_deleted(
             _delete_dataframe(obj.id)
             _delete_kitem(obj)
         elif isinstance(obj, AppConfig):
-            raise NotImplementedError(
-                "Deletion of AppConfigs not implemented yet."
-            )
+            _delete_app_spec(obj.name)
         elif isinstance(obj, KType):
             raise NotImplementedError(
                 "Deletion of KTypes not implemented yet."
@@ -814,12 +813,24 @@ def _create_or_update_app_spec(app: "AppConfig", overwrite=False) -> None:
     """Create app specfication"""
     upload_file = {"def_file": io.StringIO(yaml.safe_dump(app.specification))}
     response = _perform_request(
-        f"/api/knowledge/apps/argo/{app.name}",
+        f"/api/knowledge/apps/argo/spec/{app.name}",
         "post",
         files=upload_file,
         params={"overwrite": overwrite},
     )
     if not response.ok:
-        message = f"Something went wrong uploading app with name `{app.name}`: {response.text}"
+        message = f"Something went wrong uploading app spec with name `{app.name}`: {response.text}"
+        raise RuntimeError(message)
+    return response.text
+
+
+def _delete_app_spec(name: str) -> None:
+    """Delete app specfication"""
+    response = _perform_request(
+        f"/api/knowledge/apps/argo/spec/{name}",
+        "delete",
+    )
+    if not response.ok:
+        message = f"Something went wrong deleting app spec with name `{name}`: {response.text}"
         raise RuntimeError(message)
     return response.text

examples/create_and_run_app.py

@@ -7,37 +7,103 @@
 print("\nConnect to DSMS")
 dsms = DSMS(env="../.env")
 
+configname = "testapp2"
+kitem_name = "test item"
+
+data = """A,B,C
+1.2,1.3,1.5
+1.7,1.8,1.9
+2.0,2.1,2.3
+2.5,2.6,2.8
+3.0,3.2,3.4
+3.6,3.7,3.9
+4.1,4.3,4.4
+4.7,4.8,5.0
+5.2,5.3,5.5
+5.8,6.0,6.1
+"""
+
+extension = ".csv"
+
+parameters = [
+    {"name": "parser", "value": "csv"},
+    {"name": "time_series_header_length", "value": 1},
+    {"name": "metadata_length", "value": 0},
+    {"name": "metadata_sep", "value": ","},
+    {"name": "time_series_sep", "value": ","},
+    {
+        "name": "mapping",
+        "value": """
+            [
+                {
+                    "key": "A",
+                    "iri": "https://w3id.org/steel/ProcessOntology/TestTime",
+                    "unit": "s"
+                },
+                {
+                    "key": "B",
+                    "iri": "https://w3id.org/steel/ProcessOntology/StandardForce",
+                    "unit": "kN"
+                },
+                {
+                    "key": "C",
+                    "iri": "https://w3id.org/steel/ProcessOntology/AbsoluteCrossheadTravel",
+                    "unit": "mm"
+                }
+            ]
+            """,
+    },
+]
+
+specification = {
+    "apiVersion": "argoproj.io/v1alpha1",
+    "kind": "Workflow",
+    "metadata": {"generateName": "data2rdf-"},
+    "spec": {
+        "entrypoint": "execute_pipeline",
+        "workflowTemplateRef": {"name": "dsms-data2rdf"},
+        "arguments": {"parameters": parameters},
+    },
+}
+
 print("\nCreate app specification")
 AppConfig(
-    name="testapp",
-    specification="../../dsms-app-initiator/excel_tensile_test.argo.yaml",
+    name=configname,
+    specification=specification,  # this can also be a file path instead of a dict
 )
 
 print("\nCreate kitem")
 item = KItem(
-    name="test123",
+    name=kitem_name,
     ktype_id=dsms.ktypes.Dataset,
     kitem_apps=[
         {
-            "executable": "testapp",
+            "executable": configname,
             "title": "data2rdf",
             "additional_properties": {
                 "triggerUponUpload": True,
-                "triggerUponUploadFileExtensions": [".xlsx"],
+                "triggerUponUploadFileExtensions": [extension],
             },
         }
     ],
+    avatar={"include_qr": True},
 )
+
 print("\nCommit KItem")
 dsms.commit()
 
 print("\nAdd attachment")
-item.attachments = ["../../Desktop/AFZ1-Fz-S1D.xlsx"]
+# here we are setting the content directly,
+# but `item.attachments` can also be a list with a filepath
+# e.g. item.attachments = ["path/to/my/file.csv"]
+item.attachments = [{"name": "dummy_data.csv", "content": data}]
 
+print(item)
 
 print("\nUpload attachment and trigger app")
 dsms.commit()
 
+
 print(item)
 
 print("\nRun pipeline manually")
@@ -67,3 +133,7 @@
     print(job.logs)
     if job.status.phase != "Running":
         break
+
+print(item.url)
+
+print(item.dataframe.StandardForce.convert_to("N"))