print response content

pyscicat/client.py

@@ -85,7 +85,7 @@ def __init__(
                 self._password is not None
             ), "SciCat login credentials (username, password) must be provided if token is not provided"
             self._token = get_token(self._base_url, self._username, self._password)
-            self._headers["Authorization"] = "Bearer {}".format(self._token)
+        self._headers["Authorization"] = "Bearer {}".format(self._token)
 
     def _send_to_scicat(self, cmd: str, endpoint: str, data: BaseModel = None):
         """sends a command to the SciCat API server using url and token, returns the response JSON
@@ -109,7 +109,7 @@ def _call_endpoint(
         operation: str = "",
     ) -> Optional[dict]:
         response = self._send_to_scicat(cmd=cmd, endpoint=endpoint, data=data)
-
+        print(response.content)
         result = response.json() if len(response.content) > 0 else None
         if not response.ok:
             raise ScicatCommError(f"Error in operation {operation}: {result}")

pyscicat/model.py

@@ -96,7 +96,7 @@ class Job(MongoQueryable):
     jobResultObject: Optional[dict] = None  # ibid.
 
 
-class Instrument(MongoQueryable):
+class InstrumentOrig(MongoQueryable):
     """
     Instrument class, most of this is flexibly definable in customMetadata
     """
@@ -105,6 +105,14 @@ class Instrument(MongoQueryable):
     name: str
     customMetadata: Optional[dict] = None
 
+class Instrument(MongoQueryable):
+    """
+    Instrument class, most of this is flexibly definable in customMetadata
+    """
+
+    uniqueName: Optional[str] = None
+    name: str
+    customMetadata: Optional[dict] = None
 
 class Dataset(Ownable):
     """