labimotion 1.4.0 → 1.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5a4e5bede72cabd2f16bd75fbf033750939bbcb7cce96a4290382ddfd1026e
-  data.tar.gz: 86575f263c012a3c68a554d015ee94865ec145e31f62bcd7809d13c87837f13b
+  metadata.gz: 5564b71b1b531e05ab523719dbd1a052c19828c86921f17381ca545554f2c514
+  data.tar.gz: ee3b1e84d1aff2619a9ab65901c0f6c20af7288b3b6ef6f7ec49843dd78a543e
 SHA512:
-  metadata.gz: 4954307a55b22171b0ac8cffd598cb4d976116ce3c802a2a0f89c58098e888fb5f06e7c26ac5fab312170ab20b18967f07f6a6ecbbfde67af0b3a59f2f5f64b0
-  data.tar.gz: 7042d287f388a5cd7e2b40c98092e61a60352e7eb7f9da9900c1fee1b5e0b4a4223deae5ba8bfe109940e4d429c053e10a5f3aef84ca0c4453ba339ab2d7dd25
+  metadata.gz: a8cfa29e6fbc0ed90c8bec7e581286f2921c461c0ba8fd9b957d98cd88287630f46fe86ab7f86404afd4379623e66296e23e858746b050b66ad76f3290799792
+  data.tar.gz: af817bdab6d263afbb26b9efb7313ab505d3b56727e97b7c31149f139bfe6c45b26650ebcabc4614a4e367ff10f6719ffbedb6b9c5acae580c301a50c5379f15

data/lib/labimotion/apis/converter_api.rb

@@ -39,11 +39,11 @@ module Labimotion
         helpers do
           def convert_structure(molfile)
             molecule_viewer = Matrice.molecule_viewer
-            if molecule_viewer.blank? || molecule_viewer[:chembox_api].blank?
+            if molecule_viewer.blank? || molecule_viewer[:chembox].blank?
               { molfile: molfile }
             else
               options = { timeout: 10, body: { mol: molfile }.to_json, headers: { 'Content-Type' => 'application/json' } }
-              response = HTTParty.post("#{molecule_viewer[:chembox_api]}/core/rdkit/v1/structure", options)
+              response = HTTParty.post("#{molecule_viewer[:chembox]}/core/rdkit/v1/structure", options)
               if response.code == 200
                 { molfile: (response.parsed_response && response.parsed_response['molfile']) || molfile }
               else

data/lib/labimotion/apis/labimotion_api.rb

@@ -0,0 +1,13 @@
+# app/api/labimotion/central_api.rb
+module Labimotion
+  class LabimotionAPI < Grape::API
+    mount Labimotion::ConverterAPI
+    mount Labimotion::GenericKlassAPI
+    mount Labimotion::GenericElementAPI
+    mount Labimotion::GenericDatasetAPI
+    mount Labimotion::SegmentAPI
+    mount Labimotion::LabimotionHubAPI
+    mount Labimotion::StandardLayerAPI
+    mount Labimotion::VocabularyAPI
+  end
+end

data/lib/labimotion/apis/vocabulary_api.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'labimotion/version'
+
+module Labimotion
+  # Generic Element API
+  class VocabularyAPI < Grape::API
+    include Grape::Kaminari
+    helpers Labimotion::ParamHelpers
+
+    resource :vocab do
+      namespace :save do
+        desc 'Save vocabularies'
+        params do
+          use :std_layer_save
+        end
+        before do
+        rescue ActiveRecord::RecordNotFound
+          error!('404 Not Found', 404)
+        end
+        post do
+        rescue ActiveRecord::RecordInvalid => e
+          { error: e.message }
+        end
+      end
+
+      namespace :field_klasses do
+        desc 'get all field klasses for admin function'
+        get do
+          list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
+          present list, with: Labimotion::VocabularyEntity, root: 'klass'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
+        end
+      end
+
+    end
+  end
+end

data/lib/labimotion/libs/converter.rb

@@ -232,10 +232,12 @@ module Labimotion
       new_prop = dataset.properties
       dsr.each do |ds|
         layer = layers[ds[:layer]]
-        next if layer.nil? || layer[Labimotion::Prop::FIELDS].nil?
+        next if layer.blank? || layer[Labimotion::Prop::FIELDS].blank?
 
         fields = layer[Labimotion::Prop::FIELDS].select{ |f| f['field'] == ds[:field] }
         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]

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.4.0'
+  VERSION = '1.4.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.0.2
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,8 +38,10 @@ files:
 - lib/labimotion/apis/generic_dataset_api.rb
 - lib/labimotion/apis/generic_element_api.rb
 - lib/labimotion/apis/generic_klass_api.rb
+- lib/labimotion/apis/labimotion_api.rb
 - lib/labimotion/apis/labimotion_hub_api.rb
 - lib/labimotion/apis/segment_api.rb
+- lib/labimotion/apis/vocabulary_api.rb
 - lib/labimotion/collection/export.rb
 - lib/labimotion/collection/import.rb
 - lib/labimotion/conf.rb