labimotion 2.3.0.rc1 → 2.3.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed76c84363276af955102072d3491035f014dedb9fcdc835b4ec9c2e9ba199ee
-  data.tar.gz: 8a5e3a1d1c5ac1fb497d278c1f9a3237dfc0f93271729e05c602339879d6a204
+  metadata.gz: bf074c0e6f0eb9c3b52aec0dcde8e8c2a9b2f386027eae477a089e2ff19f4572
+  data.tar.gz: 6927c3bc49367aed7830fa2744769deb6fad51c4b24897da10531dab1cb235ce
 SHA512:
-  metadata.gz: 1d9d033f42be38117263ab30d502a3eafa5f9fa3b983f834dd1b1e14ab55537c91fafafd5b1643a6d3e2ea5e2e2ec17a8a072220cef56a4b80a34deca8f6600c
-  data.tar.gz: 926082586397c99e47f634733d2e258b463a9340809e45d5a0d4a788ff508c0335279e80baabef1f89b851691777d764b8657b6825b40a420e962dab4c6e6f36
+  metadata.gz: 30cf888e8b21894ebcf8b9bc1b1b7618271a56b73678c5f83e3ce17b420a1f8452c16ecc7b073f3bd756edc33765316714a0247a623479505a4db54a8cc7c1ab
+  data.tar.gz: 6938831a6aa29266675e58aba6e092aadc5a1252b7df453376509fe38904a5254eb42a01b333a8954039c1fc7e5b9106ad234cc5a1b71ded6b1b8d0596dbb1a0

data/lib/labimotion/apis/converter_api.rb

@@ -2,39 +2,103 @@
 
 module Labimotion
   class ConverterAPI < Grape::API
+    helpers Labimotion::DatasetHelpers
     helpers do
+      def load_converter_config!
+        @conf = Rails.configuration.converter&.url
+        @profile = Rails.configuration.converter&.profile
+        error!(406) unless @conf && @profile
+      end
+
+      def require_converter_admin!
+        error!(401) unless current_user.profile&.data&.fetch('converter_admin', false)
+      end
+
+      def uploaded_file
+        params[:file].is_a?(Array) ? params[:file][0] : params[:file]
+      end
     end
+
     resource :converter do
+      resource :datasets do
+        desc 'list Generic Dataset Klass'
+        get do
+          list = klass_list(true, false)
+          list.map do |kl|
+            pr = kl.properties_release
+            pr['name'] = kl.label
+            pr['ols'] = kl.ols_term_id
+            pr
+          end || []
+        end
+      end
+
+      resource :datasets_units do
+        desc 'list Generic Dataset Klass'
+        get do
+          Labimotion::Units::FIELDS
+        end
+      end
+
       resource :profiles do
+
         before do
-          @conf = Rails.configuration.try(:converter).try(:url)
-          @profile = Rails.configuration.try(:converter).try(:profile)
-          error!(406) unless @conf && @profile
+          load_converter_config!
         end
-        desc 'fetch profiles'
+
+        desc 'Fetch profiles (no admin required)'
         get do
           profiles = Labimotion::Converter.fetch_profiles
           { profiles: profiles, client: @profile }
         end
-        desc 'create profile'
+
+        desc 'Create profile'
         post do
+          require_converter_admin!
           Labimotion::Converter.create_profile(params)
         end
-        desc 'update profile'
+
         route_param :id do
+          desc 'Update profile'
           put do
+            require_converter_admin!
             Labimotion::Converter.update_profile(params)
           end
-        end
-        desc 'delete profile'
-        route_param :id do
+
+          desc 'Delete profile'
           delete do
-            id = params[:id]
-            Labimotion::Converter.delete_profile(id)
+            require_converter_admin!
+            Labimotion::Converter.delete_profile(params[:id])
           end
         end
-      end
 
+        resource :restore do
+          route_param :profile_id,
+                      requirements: {
+                        profile_id: /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+                      } do
+
+            route_param :profile_version,
+                        requirements: {
+                          profile_version: /\d+\.\d+/
+                        } do
+              get do
+                {test_version: params[:profile_id], version: params[:profile_version]}
+              end
+              desc 'Restore profile'
+              post do
+                require_converter_admin!
+
+                Labimotion::Converter.restore(
+                  params[:profile_id],
+                  params[:profile_version],
+                  params[:hard]
+                )
+              end
+            end
+          end
+        end
+      end
       resource :structure do
         helpers do
           def convert_structure(molfile)
@@ -66,10 +130,8 @@ module Labimotion
 
       resource :options do
         before do
-          error!(401) unless current_user.profile&.data['converter_admin'] == true
-          @conf = Rails.configuration.try(:converter).try(:url)
-          @profile = Rails.configuration.try(:converter).try(:profile)
-          error!(406) unless @conf && @profile
+          load_converter_config!
+          require_converter_admin!
         end
         desc 'fetch options'
         get do
@@ -80,18 +142,31 @@ module Labimotion
 
       resource :tables do
         before do
-          error!(401) unless current_user.profile&.data['converter_admin'] == true
-          @conf = Rails.configuration.try(:converter).try(:url)
-          @profile = Rails.configuration.try(:converter).try(:profile)
-          error!(406) unless @conf && @profile
+          load_converter_config!
+          require_converter_admin!
         end
         desc 'create tables'
         post do
-          res = Labimotion::Converter.create_tables(params[:file][0]['tempfile']) unless params[:file].empty?
-          res['metadata']['file_name'] = params[:file][0]['filename']
+          file = uploaded_file
+          res = Labimotion::Converter.create_tables(file['tempfile']) unless file.nil?
+          res['metadata']['file_name'] = file['filename']
           res
         end
       end
+
+      resource :conversions do
+        before do
+          load_converter_config!
+          require_converter_admin!
+        end
+        desc 'convert file'
+        post do
+          file = uploaded_file
+          res = Labimotion::Converter.test_conversions(file['tempfile'], params[:format]) unless file.nil?
+          res
+        end
+      end
+
     end
   end
-end
+end

data/lib/labimotion/libs/converter.rb

@@ -125,7 +125,6 @@ module Labimotion
         tmp_file.rewind
 
         filename = oat.filename
-        # name = "#{File.basename(filename, '.*')}.zip"
         name = "#{File.basename(filename, '.*')}#{File.extname(filename) == '.zip' ? '.bagit.zip' : '.zip'}"
         att = Attachment.new(
           filename: name,
@@ -247,14 +246,22 @@ module Labimotion
       dsr.each do |ds|
         layer = layers[ds[:layer]]
         next if layer.blank? || layer[Labimotion::Prop::FIELDS].blank?
+        is_unit = ds[:field].start_with?(Prop::CONVERTER_FIELD_UINT_PREFIX)
+        next if is_unit && ds[:value].nil?
 
-        fields = layer[Labimotion::Prop::FIELDS].select{ |f| f['field'] == ds[:field] }
+        field_name = ds[:field].delete_prefix(Prop::CONVERTER_FIELD_UINT_PREFIX)
+
+        fields = layer[Labimotion::Prop::FIELDS].select{ |f| f['field'] == field_name }
         fi = fields&.first
         next if fi.blank?
 
         idx = layer[Labimotion::Prop::FIELDS].find_index(fi)
-        fi['value'] = ds[:value]
-        fi['device'] = ds[:device] || ds[:value]
+        if is_unit
+          fi['value_system'] = ds[:value]
+        else
+          fi['value'] = ds[:value]
+          fi['device'] = ds[:device] || ds[:value]
+        end
         new_prop[Labimotion::Prop::LAYERS][ds[:layer]][Labimotion::Prop::FIELDS][idx] = fi
       end
       element = Container.find(dataset.element_id)&.root_element
@@ -320,6 +327,37 @@ module Labimotion
       res
     end
 
+    def self.test_conversions(tmpfile, format)
+      res = {}
+      File.open(tmpfile.path, 'r') do |file|
+        body = { file: file, format: format }
+        response = HTTParty.post(
+          uri('conversions'),
+          basic_auth: auth,
+          body: body,
+          timeout: timeout,
+        )
+        res = response.parsed_response
+      end
+      res
+    end
+
+    def self.restore(profile_id, version, hard)
+      body = { hard: hard }
+      response = HTTParty.post(
+        uri("profiles/restore/#{profile_id}/#{version}"),
+        headers: {
+          "Content-Type" => "application/json"
+        },
+        basic_auth: auth,
+        body: body.to_json,
+        timeout: timeout,
+      )
+      res = response.parsed_response
+
+      res
+    end
+
     def self.metadata(id, current_user)
       att = Attachment.find(id)
       return if att.nil? || att.attachable_id.nil? || att.attachable_type != Labimotion::Prop::CONTAINER
@@ -334,4 +372,4 @@ end
 # rubocop: enable Metrics/AbcSize
 # rubocop: enable Metrics/MethodLength
 # rubocop: enable Metrics/ClassLength
-# rubocop: enable Metrics/CyclomaticComplexity
+# rubocop: enable Metrics/CyclomaticComplexity

data/lib/labimotion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.3.0.rc1
+  version: 2.3.0.rc4
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-07-03 00:00:00.000000000 Z
+date: 2026-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx