Merge branch 'release/pybis-1-31.3'

pybis/src/python/CHANGELOG.md

+## Changes with pybis-1.31.3
+
+- fix exception in sample.save
+
 ## Changes with pybis-1.31.1
 
 - fixed a file download problem when filename contained special characters (e.g. #)

pybis/src/python/pybis/__init__.py

 name = "pybis"
 __author__ = "Swen Vermeul"
 __email__ = "swen@ethz.ch"
-__version__ = "1.31.2"
+__version__ = "1.31.3"
 
 from . import pybis
 from .pybis import DataSet

pybis/src/python/pybis/sample.py

@@ -214,6 +214,9 @@ class Sample(OpenBisObject, entity="sample", single_item_method_name="get_sample
                                 )
                             )
 
+            sampleProject = self.project.code if self.project else None
+            sampleExperiment = self.experiment.code if self.experiment else None
+
             request = {
                 "method": "createReportFromAggregationService",
                 "params": [
@@ -223,8 +226,8 @@ class Sample(OpenBisObject, entity="sample", single_item_method_name="get_sample
                     {
                         "method": "insertSample",
                         "sampleSpace": self.space.code,
-                        "sampleProject": self.project.code,
-                        "sampleExperiment": self.experiment.code,
+                        "sampleProject": sampleProject,
+                        "sampleExperiment": sampleExperiment,
                         "sampleCode": self.code,
                         "sampleType": self.type.code,
                         "sampleProperties": self.props(),
@@ -239,16 +242,22 @@ class Sample(OpenBisObject, entity="sample", single_item_method_name="get_sample
                 ],
             }
             resp = self.openbis._post_request(self.openbis.reg_v1, request)
-            if VERBOSE:
-                print("{} successfully created.".format(self.entity))
-
             try:
-                permid = resp["rows"][0][2]["value"]
-            except KeyError:
-                print(resp)
-            new_entity_data = self.openbis.get_sample(permid, only_data=True)
-            self._set_data(new_entity_data)
-            return self
+                assert resp["rows"][0][0]["value"] == "OK"
+                if VERBOSE:
+                    print("{} successfully created.".format(self.entity))
+                permId = permid = resp["rows"][0][2]["value"]
+                new_entity_data = self.openbis.get_sample(permId, only_data=True)
+                self._set_data(new_entity_data)
+                return self
+            except Exception as e:
+                errmsg = f"Could not create {self.entity}"
+                try:
+                    errmsg = resp["rows"][0][1]["value"]
+                    errmsg = errmsg.split("\n")[0].split("UserFailureException: ")[1]
+                except KeyError:
+                    pass
+                raise ValueError(errmsg)
 
         else:
             super().save()

pybis/src/python/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="PyBIS",
-    version="1.31.2",
+    version="1.31.3",
     author="Swen Vermeul • ID SIS • ETH Zürich",
     author_email="swen@ethz.ch",
     description="openBIS connection and interaction, optimized for using with Jupyter",