Merge pull request #709 from Labelbox/long/ac-554-filter

[AC-554] project.export_labels: supporting filtering by time in start/end args

Author: dk1027

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Updated docs for deprecated methods `_update_queue_mode` and `get_queue_mode` in `Project`
     * Use the `queue_mode` attribute in `Project` to get and set the queue mode instead
     * For more information, visit https://docs.labelbox.com/reference/migrating-to-workflows#upcoming-changes
+* Updated `project.export_labels` to support filtering by start/end time formats "YYYY-MM-DD" and "YYYY-MM-DD hh:mm:ss"
 ### Fixed
 
 # Version 3.27.1 (2022-09-16)

labelbox/schema/project.py

@@ -289,8 +289,8 @@ def export_labels(self,
         Args:
             download (bool): Returns the url if False
             timeout_seconds (float): Max waiting time, in seconds.
-            start (str): Earliest date for labels, formatted "YYYY-MM-DD"
-            end (str): Latest date for labels, formatted "YYYY-MM-DD"
+            start (str): Earliest date for labels, formatted "YYYY-MM-DD" or "YYYY-MM-DD hh:mm:ss"
+            end (str): Latest date for labels, formatted "YYYY-MM-DD" or "YYYY-MM-DD hh:mm:ss"
         Returns:
             URL of the data file with this Project's labels. If the server didn't
             generate during the `timeout_seconds` period, None is returned.
@@ -312,11 +312,14 @@ def _string_from_dict(dictionary: dict, value_with_quotes=False) -> str:
         def _validate_datetime(string_date: str) -> bool:
             """helper function validate that datetime is as follows: YYYY-MM-DD for the export"""
             if string_date:
-                try:
-                    datetime.strptime(string_date, "%Y-%m-%d")
-                except ValueError:
-                    raise ValueError(f"""Incorrect format for: {string_date}.
-                    Format must be \"YYYY-MM-DD\"""")
+                for fmt in ("%Y-%m-%d", "%Y-%m-%d %H:%M:%S"):
+                    try:
+                        datetime.strptime(string_date, fmt)
+                        return True
+                    except ValueError:
+                        pass
+                raise ValueError(f"""Incorrect format for: {string_date}. 
+                Format must be \"YYYY-MM-DD\" or \"YYYY-MM-DD hh:mm:ss\"""")
             return True
 
         sleep_time = 2

tests/integration/test_export.py

@@ -87,7 +87,11 @@ def test_export_filtered_dates(client,
     filtered_export = project.export_labels(download=True, start="2020-01-01")
     assert len(filtered_export) == 1
 
+    filtered_export_with_time = project.export_labels(
+        download=True, start="2020-01-01 00:00:01")
+    assert len(filtered_export_with_time) == 1
+
     empty_export = project.export_labels(download=True,
                                          start="2020-01-01",
                                          end="2020-01-02")
-    assert len(empty_export) == 0
+    assert len(empty_export) == 0