labimotion 1.3.1.1 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45876f170c9ebeb8292483cd8d6de0c56f5b341b22ce861a3994c93a6344e665
-  data.tar.gz: ac171314ea6ce8b2c9c04bf03b3f84eddf84c10508381bf088d658a5a511c11e
+  metadata.gz: 04e8244e35f9f07197148e331748e527451dae61be8352729f04b9e7be923e6f
+  data.tar.gz: 334b4f9d71132b30884e522a38cc11e770048d20d8ff4e34bc0f60ddaf45d3df
 SHA512:
-  metadata.gz: caab23ae23ce25b9b4472b23f58ee7b86e3f4fc9813ceac5a9dda0810c053f1fdc1f2f7ada3f294c826091246b167646085301a336c34cb9f72e70f9a3fc854e
-  data.tar.gz: 60befb364746e5f8a0ea6ea89fe7713857f61ca20c013b51eb744fb0c9152ef315e83546ccb5a61ec9e33f989be473d16869eec582628651a86e49f0a13489b6
+  metadata.gz: faf260b294017c7b504aa9eef458736d1076cd5f7198ba15b073f593bc5649d7c6bf892bf9deb3be449ee51ffb3b44b4936719eb1134353fdf9a4535f1d1f9ad
+  data.tar.gz: 5ca488c82012a85bdf51b37c2210ce0a9171935b387a1e6cd31ac8008398be89539c43d1c5f42825834aa013f65b5ae31de14e25d745c505fc361f5e66b5e314

data/lib/labimotion/apis/generic_element_api.rb

@@ -10,6 +10,7 @@ module Labimotion
     helpers ContainerHelpers
     helpers ParamsHelpers
     helpers CollectionHelpers
+    helpers UserLabelHelpers
     helpers Labimotion::SampleAssociationHelpers
     helpers Labimotion::GenericHelpers
     helpers Labimotion::ElementHelpers
@@ -327,7 +328,7 @@ module Labimotion
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end
-      end      
+      end
 
       desc 'Return serialized elements of current user'
       params do
@@ -336,6 +337,7 @@ module Labimotion
         optional :el_type, type: String, desc: 'element klass name'
         optional :from_date, type: Integer, desc: 'created_date from in ms'
         optional :to_date, type: Integer, desc: 'created_date to in ms'
+        optional :user_label, type: Integer, desc: 'user label'
         optional :filter_created_at, type: Boolean, desc: 'filter by created at or updated at'
         optional :sort_column, type: String, desc: 'sort by updated_at or selected layers property'
       end
@@ -426,7 +428,7 @@ module Labimotion
             raise e
           end
         end
-      end      
+      end
     end
   end
 end

data/lib/labimotion/helpers/element_helpers.rb

@@ -95,6 +95,7 @@ module Labimotion
       element.properties = update_sample_association(params[:properties], current_user, element)
       element.container = update_datamodel(params[:container], current_user)
       element.save!
+      update_element_labels(element, params[:user_labels], current_user.id)
       element.save_segments(segments: params[:segments], current_user_id: current_user.id)
       element
     rescue StandardError => e
@@ -108,6 +109,9 @@ module Labimotion
       properties = update_sample_association(params[:properties], current_user, element)
       params.delete(:container)
       params.delete(:properties)
+      update_element_labels(element, params[:user_labels], current_user.id)
+      params.delete(:user_labels)
+
       attributes = declared(params.except(:segments), include_missing: false)
       properties['pkg'] = Labimotion::Utils.pkg(properties['pkg'])
       if element.klass_uuid != properties['klass_uuid'] || element.properties != properties || element.name != params[:name]
@@ -288,6 +292,7 @@ module Labimotion
       scope = scope.elements_created_time_to(Time.at(to) + 1.day) if to && by_created_at
       scope = scope.elements_updated_time_from(Time.at(from)) if from && !by_created_at
       scope = scope.elements_updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
+      scope = scope.by_user_label(params[:user_label]) if params[:user_label]
       scope
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -315,7 +320,7 @@ module Labimotion
           return { status: 'success', message: "The element: #{attributes['name']} has been created using version: #{attributes['version']}!" }
         end
       end
-      
+
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       return { status: 'error', message: e.message }

data/lib/labimotion/helpers/param_helpers.rb

@@ -22,7 +22,7 @@ module Labimotion
         optional :sync_time, type: DateTime, desc: 'Klass sync_time'
         optional :version, type: String, desc: 'Klass version'
       end
-      
+
       params :create_element_klass_params do
         requires :name, type: String, desc: 'Element Klass Name'
         requires :label, type: String, desc: 'Element Klass Label'
@@ -40,7 +40,7 @@ module Labimotion
         optional :desc, type: String, desc: 'Element Klass Desc'
         optional :place, type: String, desc: 'Element Klass Place'
       end
-      
+
       ## Element Params
       params :create_element_params do
         requires :element_klass, type: Hash
@@ -49,18 +49,20 @@ module Labimotion
         optional :properties_release, type: Hash
         optional :collection_id, type: Integer
         requires :container, type: Hash
+        optional :user_labels, type: Array
         optional :segments, type: Array, desc: 'Segments'
       end
-      
+
       params :update_element_params do
         requires :id, type: Integer, desc: 'element id'
         optional :name, type: String
         requires :properties, type: Hash
         optional :properties_release, type: Hash
         requires :container, type: Hash
+        optional :user_labels, type: Array
         optional :segments, type: Array, desc: 'Segments'
       end
-      
+
       ## Segment Klass Params
       params :upload_segment_klass_params do
         requires :label, type: String, desc: 'Klass label'

data/lib/labimotion/libs/attachment_handler.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+require 'labimotion/version'
+
+module Labimotion
+  ## ExportDataset
+  class AttachmentHandler
+    def self.copy(original_attach, element_id, element_type, current_user_id)
+      copy_attach = Attachment.new(
+        attachable_id: element_id,
+        attachable_type: element_type,
+        aasm_state: original_attach.aasm_state,
+        created_by: current_user_id,
+        created_for: current_user_id,
+        filename: original_attach.filename,
+      )
+      copy_attach.save
+
+      copy_io = original_attach.attachment_attacher.get.to_io
+      attacher = copy_attach.attachment_attacher
+      attacher.attach copy_io
+      copy_attach.file_path = copy_io.path
+      copy_attach.save
+
+      Usecases::Attachments::Copy.update_annotation(original_attach.id, copy_attach.id) if (original_attach.attachment_data && original_attach.attachment_data['derivatives'])
+      copy_attach
+    end
+
+  end
+end

data/lib/labimotion/models/concerns/segmentable.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'labimotion/utils/utils'
+require 'labimotion/libs/attachment_handler'
 
 module Labimotion
   # Segmentable concern
@@ -29,7 +30,8 @@ module Labimotion
 
               att = Attachment.find_by(id: aid)
               att = Attachment.find_by(identifier: uid) if att.nil?
-              copied_att = att&.copy(attachable_type: Labimotion::Prop::SEGMENTPROPS, attachable_id: segment.id, transferred: true)
+              copied_att = Labimotion::AttachmentHandler.copy(att, segment.id, Labimotion::Prop::SEGMENTPROPS, args[:current_user_id])
+
               if copied_att.nil?
                 properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['files'].delete_at(fdx)
               else

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.3.1.1'
+  VERSION = '1.4.0.rc1'
 end

data/lib/labimotion.rb

@@ -62,6 +62,7 @@ module Labimotion
   autoload :ExportDataset, 'labimotion/libs/export_dataset'
   autoload :SampleAssociation, 'labimotion/libs/sample_association'
   autoload :PropertiesHandler, 'labimotion/libs/properties_handler'
+  autoload :AttachmentHandler, 'labimotion/libs/attachment_handler'
 
   ######## Utils
   autoload :Prop, 'labimotion/utils/prop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.3.1.1
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - lib/labimotion/helpers/sample_association_helpers.rb
 - lib/labimotion/helpers/search_helpers.rb
 - lib/labimotion/helpers/segment_helpers.rb
+- lib/labimotion/libs/attachment_handler.rb
 - lib/labimotion/libs/converter.rb
 - lib/labimotion/libs/export_dataset.rb
 - lib/labimotion/libs/export_element.rb
@@ -121,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: