vislearnlabpy 0.0.3.2__tar.gz → 0.0.3.4__tar.gz

{vislearnlabpy-0.0.3.2/src/vislearnlabpy.egg-info → vislearnlabpy-0.0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vislearnlabpy
-Version: 0.0.3.2
+Version: 0.0.3.4
 Summary: Visual Learning Lab utility files and pipelines
 Author-email: Tarun Sepuri <tarunsepuri@gmail.com>
 License-Expression: MIT

{vislearnlabpy-0.0.3.2 → vislearnlabpy-0.0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vislearnlabpy"
-version = "0.0.3.2"
+version = "0.0.3.4"
 authors = [
   { name="Tarun Sepuri", email="tarunsepuri@gmail.com" },
 ]

{vislearnlabpy-0.0.3.2 → vislearnlabpy-0.0.3.4}/src/vislearnlabpy/drawings/svg_render_helpers.py

@@ -79,9 +79,10 @@ def render_and_save(Verts,
 
     '''
     for i, verts in enumerate(Verts):
-        # if we're only rendering the last stroke
+        # Skip all but the last iteration if last_stroke_only is True
         if last_stroke_only and i != len(Verts) - 1:
             continue
+            
         codes = Codes[i]
         fig = plt.figure(figsize=(stroke_settings.imsize, stroke_settings.imsize), frameon=False)
         ax = plt.subplot(111)
@@ -97,14 +98,29 @@ def render_and_save(Verts,
                             hspace=0, wspace=0)
 
         ### render sketch so far
-        if len(verts) > 0:
-            path = Path(verts, codes)
-            patch = patches.PathPatch(path, facecolor='none', edgecolor=stroke_settings.edgecolor, lw=stroke_settings.line_width)
-            ax.add_patch(patch)
-            plt.gca().invert_yaxis()  # y values increase as you go down in image
+        if last_stroke_only:
+            # Render all strokes for the final image
+            for stroke_idx in range(len(Verts)):
+                stroke_verts = Verts[stroke_idx]
+                stroke_codes = Codes[stroke_idx]
+                if len(stroke_verts) > 0:
+                    path = Path(stroke_verts, stroke_codes)
+                    patch = patches.PathPatch(path, facecolor='none', 
+                                            edgecolor=stroke_settings.edgecolor, 
+                                            lw=stroke_settings.line_width)
+                    ax.add_patch(patch)
+        else:
+            # Render only current stroke
+            if len(verts) > 0:
+                path = Path(verts, codes)
+                patch = patches.PathPatch(path, facecolor='none', 
+                                        edgecolor=stroke_settings.edgecolor, 
+                                        lw=stroke_settings.line_width)
+                ax.add_patch(patch)
+        
+        plt.gca().invert_yaxis()  # y values increase as you go down in image
 
         ## save out as png
-        ## maybe to make it not render every single thing, use plt.ioff
         os.makedirs(save_dir, exist_ok=True)
         if not last_stroke_only:
             # saving stroke count and not index so i+1
@@ -112,11 +128,11 @@ def render_and_save(Verts,
         else:
             # not including stroke count in the name since we're only saving the final stroke
             fname = f'{base_filename}.png'
+            
         filepath = os.path.join(save_dir, fname)
         fig.savefig(filepath, bbox_inches='tight', pad_inches=0.0)
         plt.close(fig)
 
-
 def polyline_pathmaker(lines):
     x = []
     y = []

{vislearnlabpy-0.0.3.2 → vislearnlabpy-0.0.3.4}/src/vislearnlabpy/extractions/drawingtask_extractor.py

@@ -75,15 +75,15 @@ class StrokeData:
 
 class DrawingsExtractor():
     @staticmethod
-    def get_default_transformation():
-        defualt_settings = ImgExtractionSettings()
-        return ImageExtractor.get_transformations(defualt_settings)
+    def get_default_transformation_settings():
+        default_settings = ImgExtractionSettings()
+        return default_settings
 
     @staticmethod
-    def save_transformed(imgData, fname, transform=None):
-        if transform is None:
-            transform = DrawingsExtractor.get_default_transformation()
-        
+    def save_transformed(imgData, fname, transform_settings=None):
+        if transform_settings is None:
+            transform_settings = DrawingsExtractor.get_default_transformation_settings()
+        transform = ImageExtractor.get_transformations(transform_settings)
         img_bytes = base64.b64decode(imgData)
         img = Image.open(io.BytesIO(img_bytes))
         img = transform(img)
@@ -99,9 +99,10 @@ class DrawingsExtractor():
         return _im
     
     @staticmethod
-    def save_transformed_file(fname, transform=None):
-        if transform is None:
-            transform = DrawingsExtractor.get_default_transformation()
+    def save_transformed_file(fname, transform_settings=None):
+        if transform_settings is None:
+            transform_settings = DrawingsExtractor.get_default_transformation()
+        transform = ImageExtractor.get_transformations(transform_settings)  
         img = Image.open(fname)
         img = transform(img)
         img.save(fname)
@@ -354,7 +355,7 @@ class DrawingTaskExtractor(MongoExtractor):
         age_part, participant_part = self._age_participant_parts(age, participant_id, session_id)
         return f"{category}_{extraction_type}_{age_part}{participant_part}{session_id}"
 
-    def extract_images(self, image_dir=None, imsize=224, transform_file=False, highres=False, stroke_settings=StrokeSettings(), transform_settings=None):
+    def extract_images(self, image_dir=None, imsize=224, transform_file=False, highres=False, stroke_settings=StrokeSettings(), transform_settings=None, **filters):
         if image_dir is None:
             image_dir = os.path.join(self.output_dir, 'sketches_full_dataset')
         # Initialize tracking variables
@@ -365,9 +366,20 @@ class DrawingTaskExtractor(MongoExtractor):
         # Initialize data storage
         trials = []
         query = {'dataType': 'finalImage'}
+        query.update({
+            save_format_to_field_map.get(key, key): {'$in': values}
+            for key, values in filters.items()
+            if values  # only include if values is non-empty
+        })
         # Get all sessions
-        sessions_to_render = list(self.collection.find(self._add_date_query(query)).distinct('sessionId'))
-        sessions_to_render = self._render_unprocessed_sessions('AllDescriptives_images', sessions_to_render)
+        sessions_to_render_with_cats = list(set([
+            (doc['sessionId'], doc['category'])
+            for doc in self.collection.find(self._add_date_query(query), {'sessionId': 1, 'category': 1})
+            if 'category' in doc
+        ]))
+        # unprocessed sessions with categoriess to account for previous saves that don't include all categories
+        sessions_to_render = self._render_unprocessed_sessions_with_cats(f'AllDescriptives_images',
+                                                                  sessions_to_render_with_cats)
 
         time_start = time.time()
 
@@ -392,6 +404,8 @@ class DrawingTaskExtractor(MongoExtractor):
                 for imrec in image_recs:
                     if 'category' not in imrec or imrec['category'] is None:
                         continue
+                    if 'category' in filters and imrec['category'] not in filters['category']:
+                        continue
                     participant_id_col = self._participant_id_col(imrec)
                     if participant_id_col is None:
                         logger.warning(f"Participant ID not found in image record, skipping: {imrec}")
@@ -441,6 +455,8 @@ class DrawingTaskExtractor(MongoExtractor):
                                         stroke_settings=stroke_settings,
                                         last_stroke_only=True)
                             if transform_file:
+                                if transform_settings is None:
+                                    transform_settings = ImgExtractionSettings(resize_dim=768)
                                 DrawingsExtractor.save_transformed_file(fname, transform_settings)
 
                         else:

{vislearnlabpy-0.0.3.2 → vislearnlabpy-0.0.3.4/src/vislearnlabpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vislearnlabpy
-Version: 0.0.3.2
+Version: 0.0.3.4
 Summary: Visual Learning Lab utility files and pipelines
 Author-email: Tarun Sepuri <tarunsepuri@gmail.com>
 License-Expression: MIT