labstep 3.26.0__tar.gz → 3.28.0__tar.gz

{labstep-3.26.0 → labstep-3.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: labstep
-Version: 3.26.0
+Version: 3.28.0
 Summary: Python SDK for working with the Labstep API
 Home-page: http://github.com/Labstep/labstepPy
 Author: Labstep

labstep-3.28.0/labstep/constants/version.py

@@ -0,0 +1 @@
+VERSION = "3.28.0"

{labstep-3.26.0 → labstep-3.28.0}/labstep/entities/collaboratorRoleRequirement/repository.py

@@ -2,10 +2,12 @@
 # -*- coding: utf-8 -*-
 # Author: Labstep <dev@labstep.com>
 
-from labstep.entities.collaboratorRoleRequirement.model import CollaboratorRoleRequirement
 import labstep.generic.entity.repository as entityRepository
-from labstep.generic.entityList.model import EntityList
 from labstep.constants import UNSPECIFIED
+from labstep.entities.collaboratorRoleRequirement.model import \
+    CollaboratorRoleRequirement
+from labstep.generic.entityList.model import EntityList
+
 
 def getCollaboratorRoleRequirements(user, entityState):
     if entityState['entity_user_role_requirements'] is None or entityState['entity_user_role_requirements'] == []:
@@ -47,6 +49,7 @@ def editCollaboratorRoleRequirement(collaboratorRoleRequirement,
     if auto_assign == 'creator:':
         params['automation'] = {
         'type': 'experiment_workflow_create',
+        'trigger_type': 'log',
         'trigger_log_type': 'experiment_workflow_created',
         'filter': [],
         'action': 'set_entity_user_role',
@@ -54,6 +57,7 @@ def editCollaboratorRoleRequirement(collaboratorRoleRequirement,
     if auto_assign == 'contributor':
         params['automation'] ={
             "type":"experiment_workflow_edit",
+            "trigger_type": 'log',
             "trigger_log_type":"experiment_workflow_updated",
             "filter":[
                 {"type":"and",

labstep-3.28.0/labstep/entities/jupyterInstance/model.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Author: Labstep <dev@labstep.com>
+
+from labstep.constants import UNSPECIFIED
+from labstep.generic.entity.model import Entity
+
+
+class JupyterInstance(Entity):
+    """
+    Represents an JupyterInstance on Labstep.
+    """
+
+    __entityName__ = "jupyter-instance"
+    __hasGuid__ = True
+
+    def edit(self, startedAt=UNSPECIFIED, endedAt=UNSPECIFIED, status=UNSPECIFIED, errorMessage=UNSPECIFIED):
+        """
+        Edit an existing JupyterInstance.
+
+        Parameters
+        ----------
+        startedAt (datetime, optional)
+            Start date.
+        endedAt (datetime, optional)
+            End date.
+        status (string, optional)
+            Status can be 'success' or 'error'.
+        errorMessage (string, optional)
+            Error message.
+
+        Returns
+        -------
+        :class:`~labstep.entities.jupyterInstance.model.Device`
+            An object representing the edited Device.
+
+        Example
+        -------
+        ::
+
+            myJuyterInstance = user.getJupyterInstance('943fe3f3-a50e-40a0-9b91-a0fa5675b9ac)
+            myJuyterInstance.edit(startedAt='2024-01-01T00:00:00+0000')
+        """
+        import labstep.entities.jupyterInstance.repository as jupyterInstanceRepository
+
+        return jupyterInstanceRepository.editJupyterInstance(
+            self,
+            startedAt,
+            endedAt,
+            status,
+            errorMessage
+        )

{labstep-3.26.0 → labstep-3.28.0}/labstep/entities/jupyterInstance/repository.py

@@ -2,25 +2,27 @@
 # -*- coding: utf-8 -*-
 # Author: Labstep <dev@labstep.com>
 
-from labstep.entities.jupyterInstance.model import JupyterInstance
 import labstep.generic.entity.repository as entityRepository
 from labstep.constants import UNSPECIFIED
+from labstep.entities.jupyterInstance.model import JupyterInstance
 
 
-def getJupyterInstance(user, guid):
-    return entityRepository.getEntity(user, JupyterInstance, id=guid)
+def getJupyterInstance(user, id):
+    return entityRepository.getEntity(user, JupyterInstance, id)
 
 
 def editJupyterInstance(
     jupyterInstance,
-    data=UNSPECIFIED,
     startedAt=UNSPECIFIED,
-    endedAt=UNSPECIFIED
+    endedAt=UNSPECIFIED,
+    status=UNSPECIFIED,
+    errorMessage=UNSPECIFIED
 ):
     params = {
-        "data": data,
         "started_at": startedAt,
         "ended_at": endedAt,
+        "status": status,
+        "error_message": errorMessage,
     }
 
     return entityRepository.editEntity(jupyterInstance, params)

{labstep-3.26.0 → labstep-3.28.0}/labstep/entities/purchaseOrder/repository.py

@@ -2,22 +2,22 @@
 # -*- coding: utf-8 -*-
 # Author: Labstep <dev@labstep.com>
 
-from labstep.service.helpers import handleKeyword
-from labstep.entities.purchaseOrder.model import PurchaseOrder
 import labstep.generic.entity.repository as entityRepository
 from labstep.constants import UNSPECIFIED
+from labstep.entities.purchaseOrder.model import PurchaseOrder
+from labstep.service.helpers import handleKeyword
 
 
 def newPurchaseOrder(user,name=UNSPECIFIED, status=UNSPECIFIED, currency='USD', extraParams={}):
     params = {'name':name,
               "group_id": user.activeWorkspace,
-              "status": handleKeyword(status), 
+              "status": handleKeyword(status),
               "currency": currency,
               **extraParams}
     return entityRepository.newEntity(user, PurchaseOrder, params)
 
 def getPurchaseOrder(user, purchase_order_id, extraParams={}):
-    return entityRepository.getEntity(user, PurchaseOrder, id=purchase_order_id, extraParams={**extraParams,'serializerGroups': 'order_request_show'})
+    return entityRepository.getEntity(user, PurchaseOrder, id=purchase_order_id, extraParams={**extraParams,'serializerGroups': 'default,order_request_show'})
 
 
 def getPurchaseOrders(

{labstep-3.26.0 → labstep-3.28.0}/labstep/entities/resourceItem/repository.py

@@ -2,14 +2,14 @@
 # -*- coding: utf-8 -*-
 # Author: Labstep <dev@labstep.com>
 
-from labstep.entities.resourceItem.model import ResourceItem
 import labstep.generic.entity.repository as entityRepository
-from labstep.service.helpers import handleKeyword
 from labstep.constants import UNSPECIFIED
+from labstep.entities.resourceItem.model import ResourceItem
+from labstep.service.helpers import handleKeyword
 
 
 def getResourceItem(user, resourceItem_id):
-    return entityRepository.getEntity(user, ResourceItem, id=resourceItem_id, extraParams={'serializerGroups': 'resource_item_metadatas'})
+    return entityRepository.getEntity(user, ResourceItem, id=resourceItem_id, extraParams={'serializerGroups': 'default,resource_item_metadatas'})
 
 
 def getResourceItems(

{labstep-3.26.0 → labstep-3.28.0}/labstep/service/helpers.py

@@ -63,7 +63,7 @@ def handleDate(date):
         except ValueError:
             pass
     raise ValueError(
-        'Please Specify date in format: YY-MM-DD or YY-MM-DD HH:MM:SS')
+        'Please Specify date in format: YYYY-MM-DD, YYYY-MM-DD HH:MM or YYYY-MM-DD HH:MM:SS')
 
 
 def handleString(string):

{labstep-3.26.0 → labstep-3.28.0}/labstep.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: labstep
-Version: 3.26.0
+Version: 3.28.0
 Summary: Python SDK for working with the Labstep API
 Home-page: http://github.com/Labstep/labstepPy
 Author: Labstep

labstep-3.26.0/labstep/constants/version.py

@@ -1 +0,0 @@
-VERSION = "3.26.0"

labstep-3.26.0/labstep/entities/jupyterInstance/model.py

@@ -1,92 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Author: Labstep <dev@labstep.com>
-
-from labstep.generic.entity.model import Entity
-from labstep.service.helpers import getTime
-
-
-class JupyterInstance(Entity):
-    """
-    Represents an JupyterInstance on Labstep.
-    """
-
-    __entityName__ = "jupyter-instance"
-    __hasGuid__ = True
-
-    def start(self):
-        """
-        Update JupyterInstance to indicate that server instance has started and is ready to use.
-
-        Parameters
-        ----------
-
-        Returns
-        -------
-        :class:`~labstep.entities.jupyterInstance.model.JupyterInstance`
-            An object representing the edited JupyterInstance.
-
-        Example
-        -------
-        ::
-
-            my_jupyterInstance = user.getJupyterInstance("872b3e7e-e21f-4403-9ef3-3650fe0d86ba")
-            my_jupyterInstance.start()
-        """
-        import labstep.entities.jupyterInstance.repository as jupyterInstanceRepository
-
-        return jupyterInstanceRepository.editJupyterInstance(
-            self, startedAt=getTime()
-        )
-
-    def end(self):
-        """
-        Update JupyterInstance to indicate that server instance has shutdown.
-
-        Parameters
-        ----------
-
-        Returns
-        -------
-        :class:`~labstep.entities.jupyterInstance.model.JupyterInstance`
-            An object representing the edited JupyterInstance.
-
-        Example
-        -------
-        ::
-
-            my_jupyterInstance = user.getJupyterInstance("872b3e7e-e21f-4403-9ef3-3650fe0d86ba")
-            my_jupyterInstance.end()
-        """
-        import labstep.entities.jupyterInstance.repository as jupyterInstanceRepository
-
-        return jupyterInstanceRepository.editJupyterInstance(
-            self, endedAt=getTime()
-        )
-
-    def edit(self, data=None, extraParams={}):
-        """
-        Edit an existing JupyterInstance.
-
-        Parameters
-        ----------
-        data (str)
-            JupyterNotebook ipyb JSON data.
-
-        Returns
-        -------
-        :class:`~labstep.entities.jupyterInstance.model.JupyterInstance`
-            An object representing the edited JupyterInstance.
-
-        Example
-        -------
-        ::
-
-            my_jupyterInstance = user.getJupyterInstance("872b3e7e-e21f-4403-9ef3-3650fe0d86ba")
-            my_jupyterInstance.edit(data='{test: 42}')
-        """
-        import labstep.entities.jupyterInstance.repository as jupyterInstanceRepository
-
-        return jupyterInstanceRepository.editJupyterInstance(
-            self, data=data
-        )

{labstep-3.26.0 → labstep-3.28.0}/labstep/entities/resource/model.py

@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 # Author: Labstep <dev@labstep.com>
 
-from labstep.service.helpers import getTime
+from labstep.constants import PLACEHOLDER_SVG, UNSPECIFIED
+from labstep.entities.resourceItem.model import ResourceItem
 from labstep.generic.entityPrimary.model import EntityPrimary
 from labstep.generic.entityWithMetadata.model import EntityWithMetadata
-from labstep.entities.resourceItem.model import ResourceItem
-from labstep.constants import PLACEHOLDER_SVG, UNSPECIFIED
+from labstep.service.helpers import getTime
 
 
 class Resource(EntityPrimary, EntityWithMetadata):