girder-sample-tracker 2.0.3__tar.gz → 2.0.4__tar.gz

{girder_sample_tracker-2.0.3/girder_sample_tracker.egg-info → girder_sample_tracker-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-sample-tracker
-Version: 2.0.3
+Version: 2.0.4
 Summary: Girder Plugin adding a simple tracker for material samples
 License: BSD
 Classifier: Development Status :: 4 - Beta

{girder_sample_tracker-2.0.3 → girder_sample_tracker-2.0.4}/girder_sample_tracker/models/sample.py

@@ -34,7 +34,7 @@ class Sample(AccessControlledModel):
     def create(
         self, name, creator, description=None, eventTypes=None, access=None, save=True
     ):
-        now = datetime.datetime.utcnow()
+        now = datetime.datetime.now(datetime.UTC)
 
         sample = {
             "name": name,

{girder_sample_tracker-2.0.3 → girder_sample_tracker-2.0.4}/girder_sample_tracker/rest/sample.py

@@ -1,4 +1,6 @@
+import csv
 import datetime
+import io
 import math
 from urllib.parse import urlparse
 
@@ -97,7 +99,7 @@ class Sample(Resource):
             sample["description"] = description
         if eventTypes != sample.get("eventTypes", []):
             sample["eventTypes"] = eventTypes
-        sample["updated"] = datetime.datetime.utcnow()
+        sample["updated"] = datetime.datetime.now(datetime.UTC)
         return SampleModel().save(sample)
 
     @access.user
@@ -301,7 +303,7 @@ class Sample(Resource):
         user = self.getCurrentUser()
         event = {
             "comment": comment,
-            "created": datetime.datetime.utcnow(),
+            "created": datetime.datetime.now(datetime.UTC),
             "creator": user["_id"],
             "creatorName": f"{user['firstName']} {user['lastName']}",
             "eventType": eventType,
@@ -367,15 +369,29 @@ class Sample(Resource):
 
         def stream():
             _zip = ziputil.ZipGenerator()
+            csv_data = io.StringIO()
+            csv_writer = csv.writer(csv_data)
+            csv_writer.writerow(["Sample ID", "Sample Name", "Add Event URL"])
             for sample_id in ids:
                 doc = SampleModel().load(sample_id, user=user, level=AccessType.READ)
                 qr_img = SampleModel().qr_code(doc, girder_base)
+                csv_writer.writerow(
+                    [
+                        str(doc["_id"]),
+                        doc["name"],
+                        f"{girder_base}/#sample/{doc['_id']}/add"
+                    ]
+                )
 
                 def qr_stream():
                     yield qr_img.getvalue()
 
-                for data in _zip.addFile(qr_stream, f"{doc['name']}.png"):
-                    yield data
+                yield from _zip.addFile(qr_stream, f"{doc['name']}.png")
+
+            def csv_stream():
+                csv_data.seek(0)
+                yield csv_data.getvalue()
+            yield from _zip.addFile(csv_stream, "samples.csv")
             yield _zip.footer()
 
         return stream

{girder_sample_tracker-2.0.3 → girder_sample_tracker-2.0.4/girder_sample_tracker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-sample-tracker
-Version: 2.0.3
+Version: 2.0.4
 Summary: Girder Plugin adding a simple tracker for material samples
 License: BSD
 Classifier: Development Status :: 4 - Beta

{girder_sample_tracker-2.0.3 → girder_sample_tracker-2.0.4}/setup.py

@@ -9,7 +9,7 @@ setup(
     name="girder-sample-tracker",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="2.0.3",
+    version="2.0.4",
     description="Girder Plugin adding a simple tracker for material samples",
     packages=find_packages(),
     include_package_data=True,