vislearnlabpy 0.0.3.0__tar.gz → 0.0.3.2__tar.gz

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

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

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

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

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

@@ -66,7 +66,8 @@ def render_and_save(Verts,
                     Codes,
                     stroke_settings: StrokeSettings = StrokeSettings(),
                     save_dir=os.getcwd(),
-                    base_filename='strokes'):
+                    base_filename='strokes',
+                    last_stroke_only=False):
     '''
     input:
         line_width: how wide of strokes do we want? (int)
@@ -77,9 +78,10 @@ def render_and_save(Verts,
         rendered sketches into nested directories
 
     '''
-    verts = Verts[0]
-    codes = Codes[0]
     for i, verts in enumerate(Verts):
+        # if we're only rendering the last stroke
+        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)
@@ -104,8 +106,12 @@ def render_and_save(Verts,
         ## save out as png
         ## maybe to make it not render every single thing, use plt.ioff
         os.makedirs(save_dir, exist_ok=True)
-        # saving stroke count and not index so i+1
-        fname = '{}_{}.png'.format(base_filename, i+1)
+        if not last_stroke_only:
+            # saving stroke count and not index so i+1
+            fname = f'{base_filename}_{i+1}.png'
+        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)

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

@@ -3,7 +3,7 @@ from io import StringIO
 import logging
 
 from typing import Optional, Tuple
-from vislearnlabpy.embeddings.stimuli_loader import ImageExtractor
+from vislearnlabpy.embeddings.stimuli_loader import ImageExtractor, ImgExtractionSettings
 import io
 import base64
 from PIL import Image
@@ -76,7 +76,8 @@ class StrokeData:
 class DrawingsExtractor():
     @staticmethod
     def get_default_transformation():
-        return ImageExtractor.get_transformations(apply_center_crop=False, apply_content_crop=True, use_thumbnail=True)
+        defualt_settings = ImgExtractionSettings()
+        return ImageExtractor.get_transformations(defualt_settings)
 
     @staticmethod
     def save_transformed(imgData, fname, transform=None):
@@ -97,6 +98,14 @@ class DrawingsExtractor():
         _im = np.array(im)
         return _im
     
+    @staticmethod
+    def save_transformed_file(fname, transform=None):
+        if transform is None:
+            transform = DrawingsExtractor.get_default_transformation()
+        img = Image.open(fname)
+        img = transform(img)
+        img.save(fname)
+    
     @staticmethod
     def get_mean_intensity(img, imsize):
         thresh = 250
@@ -277,6 +286,7 @@ class DrawingTaskExtractor(MongoExtractor):
         return this_intensity, this_bounding_box
 
     def _output_filename(self, filename_prefix, run_name):
+        # todo: add more filename customization
         return os.path.join(self.output_dir, f"{filename_prefix}_final_{run_name}.csv")
     
     def _save_dataframe(self, data_dict, filename_prefix, run_name):
@@ -344,7 +354,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):
+    def extract_images(self, image_dir=None, imsize=224, transform_file=False, highres=False, stroke_settings=StrokeSettings(), transform_settings=None):
         if image_dir is None:
             image_dir = os.path.join(self.output_dir, 'sketches_full_dataset')
         # Initialize tracking variables
@@ -418,13 +428,28 @@ class DrawingTaskExtractor(MongoExtractor):
                                 draw_duration, intensity, bounding_box, imrec.get('age', None)
                             )
                         )
-                        
-                        # Save image files
-                        if transform_file:
-                            DrawingsExtractor.save_transformed(imrec['imgData'], fname)
+                        if highres:
+                            # Use the existing SVG helper functions
+                            svg_list = make_svg_list(stroke_recs)
+                            # Get verts and codes
+                            Verts, Codes = get_verts_and_codes(svg_list)
+                            # Render and save as PNGs
+                            render_and_save(Verts,
+                                        Codes,
+                                        save_dir=category_dir,
+                                        base_filename=base_filename,
+                                        stroke_settings=stroke_settings,
+                                        last_stroke_only=True)
+                            if transform_file:
+                                DrawingsExtractor.save_transformed_file(fname, transform_settings)
+
                         else:
-                            with open(fname, "wb") as fh:
-                                fh.write(base64.b64decode(imrec['imgData']))
+                            # Save image files
+                            if transform_file:
+                                DrawingsExtractor.save_transformed(imrec['imgData'], fname, transform_settings)
+                            else:
+                                with open(fname, "wb") as fh:
+                                    fh.write(base64.b64decode(imrec['imgData']))
                         write_count += 1
                         if np.mod(write_count, 100) == 0:
                             time_spent = (time.time() - time_start) / 60
@@ -491,7 +516,7 @@ class DrawingTaskExtractor(MongoExtractor):
             self._save_dataframe(trials, 'AllDescriptives_audio', self.collection.name)
             trials = []
         print(f"Finished processing {write_count} audio files")
-
+        
     def extract_strokes(self, save_dir=None, save_type="png", stroke_settings=StrokeSettings(), **filters):
         """
         Extract stroke documents for all (or specified) sessions/trials.

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

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