labimotion 1.4.0.rc4 → 1.4.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38f255a309e305ddfe715e5382c0087acde8a05c42434a8c87c03640ad38772
-  data.tar.gz: a3ed70fa27d008b51f416fbd4ac9a2ce70e1d3cc117bdfa37e31010a62301b98
+  metadata.gz: f17746bfc2e59e5a5831ba43f167b081e1c9d0f40fbecd6e5d6c780b42b55cea
+  data.tar.gz: 2b87525c3e275df8e80a1c75501a20014f1c5355fd149d76fd509b8819f8bab9
 SHA512:
-  metadata.gz: e80ca22f7120c4d3f34b9eecc37baa2b40a83b7d34409b4598129bb939e1c473ed6fa7fe06c7c2396210dc25571238b1bc51733fafb373e8928c076aa8761fe2
-  data.tar.gz: 70ddf10ed69d7eea7ac3769e3a32dd59b38b3eed052ba232e9cdbadacaa2ef6bab9ea204537390c2abe71f06246ac9eeb650b2731b28d92ad8d1bc0d534d4b38
+  metadata.gz: c38733299255e71615703933d0caa2e55594cb73e66b9265ad260dd0ced46b7aea98f903b3d0d0874648c04fcdedbc0c2f8156d69aaa82520816be02a8ec149a
+  data.tar.gz: c676883c9c863a1efbeccf27ba0c22f5b0cb21afae26339c449608a8de7c1c486501a829039a4d379d05b59853696969e5b06f685e9f389d87ccfdae9e3a7dc3

data/lib/labimotion/apis/generic_element_api.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'labimotion/version'
+require 'labimotion/conf'
 require 'labimotion/libs/export_element'
 
 module Labimotion
@@ -17,6 +17,19 @@ module Labimotion
     helpers Labimotion::ParamHelpers
 
     resource :generic_elements do
+      # might be removed because the file is moved to public folder
+      namespace :current do
+        desc 'Return serialized elements of current user'
+        get do
+          klasses_json_path = Labimotion::KLASSES_JSON # Rails.root.join('app/packs/klasses.json')
+          klasses = JSON.parse(File.read(klasses_json_path))
+          { klasses: klasses }
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          { klasses: [] }
+        end
+      end
+
       namespace :klass do
         desc 'get klass info'
         params do

data/lib/labimotion/collection/import.rb

@@ -47,8 +47,12 @@ module Labimotion
       begin
         data.fetch('Labimotion::Dataset', {}).each do |uuid, fields|
           klass_id = fields['dataset_klass_id']
-          dk_obj = data.fetch('Labimotion::DatasetKlass', {})[klass_id]
-          dk_id = dk_obj['identifier']
+          next if data.fetch('Labimotion::DatasetKlass', {}).empty?
+
+          dk_obj = data.fetch('Labimotion::DatasetKlass', {}) && data.fetch('Labimotion::DatasetKlass', {})[klass_id]
+          next if dk_obj.nil?
+
+          dk_id = dk_obj && dk_obj['identifier']
           element_uuid = fields.fetch('element_id')
           element_type = fields.fetch('element_type')
           element = instances.fetch(element_type).fetch(element_uuid)
@@ -78,7 +82,7 @@ module Labimotion
         end
       rescue StandardError => e
         Labimotion.log_exception(e)
-        raise
+        # raise
       end
     end
 

data/lib/labimotion/conf.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+## Labimotion Configuration
+module Labimotion
+  KLASSES_JSON = Rails.root.join('public', 'klasses.json').to_s.freeze # Rails.root.join('app/packs/klasses.json').to_s.freeze
+end

data/lib/labimotion/helpers/element_helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'grape'
+require 'labimotion/conf'
 require 'labimotion/utils/utils'
 # require 'labimotion/models/element_klass'
 module Labimotion
@@ -33,7 +34,7 @@ module Labimotion
       new_klass = Labimotion::ElementKlass.create!(attributes)
       new_klass.reload
       new_klass.create_klasses_revision(current_user)
-      klass_names_file = Rails.root.join('app/packs/klasses.json')
+      klass_names_file = Labimotion::KLASSES_JSON # Rails.root.join('app/packs/klasses.json')
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
       klasses

data/lib/labimotion/helpers/generic_helpers.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'grape'
+require 'labimotion/conf'
 require 'labimotion/utils/utils'
 # Helper for associated sample
 module Labimotion
@@ -23,7 +24,7 @@ module Labimotion
     def deactivate_klass(params)
       klz = fetch_klass(params[:klass], params[:id])
       klz&.update!(is_active: params[:is_active])
-      generate_klass_file unless klz.class.name != 'ElementKlass'
+      generate_klass_file unless klz.class.name != 'Labimotion::ElementKlass'
       klz
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -34,7 +35,7 @@ module Labimotion
       authenticate_admin!(params[:klass].gsub(/(Klass)/, 's').downcase)
       klz = fetch_klass(params[:klass], params[:id])
       klz&.destroy!
-      generate_klass_file unless klz.class.name != 'ElementKlass'
+      generate_klass_file unless klz.class.name != 'Labimotion::ElementKlass'
       status 201
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -97,7 +98,7 @@ module Labimotion
 
     ###############
     def generate_klass_file
-      klass_names_file = Rails.root.join('app/packs/klasses.json')
+      klass_names_file = Labimotion::KLASSES_JSON # Rails.root.join('app/packs/klasses.json')
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
     rescue StandardError => e

data/lib/labimotion/models/element_klass.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'labimotion/conf'
 require 'labimotion/models/concerns/generic_klass_revisions'
 require 'labimotion/models/concerns/workflow'
 
@@ -18,7 +19,8 @@ module Labimotion
       klasses = []
     ensure
       File.write(
-        Rails.root.join('app/packs/klasses.json'),
+        # Rails.root.join('app/packs/klasses.json'),
+        Labimotion::KLASSES_JSON,
         klasses&.to_json || []
       )
     end

data/lib/labimotion/version.rb

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

data/lib/labimotion.rb

@@ -1,6 +1,7 @@
 # In your_gem_name.rb or main Ruby file
 module Labimotion
 
+  autoload :CONF, 'labimotion/conf'
   autoload :VERSION, 'labimotion/version'
 
   def self.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc4
+  version: 1.4.0.rc6
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,6 +42,7 @@ files:
 - lib/labimotion/apis/segment_api.rb
 - lib/labimotion/collection/export.rb
 - lib/labimotion/collection/import.rb
+- lib/labimotion/conf.rb
 - lib/labimotion/entities/application_entity.rb
 - lib/labimotion/entities/dataset_entity.rb
 - lib/labimotion/entities/dataset_klass_entity.rb