Merge pull request #3 from ncbo/master

Sync: BioPortal v5.33.4 release

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/ncbo/goo.git
-  revision: f943ac33e87c55c88131c32d826ed5d39c89302c
+  revision: 39f67ab7fae7675b6ff417ace0ab923e40ffcbcd
   branch: master
   specs:
     goo (0.0.2)
@@ -16,7 +16,7 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ontologies_linked_data.git
-  revision: 9ab4be437ed84f5a480e7f0d8799824fcea310ae
+  revision: 536cbe5cef9e23abc299ed44942c0b3966f9c18d
   branch: master
   specs:
     ontologies_linked_data (0.0.1)
@@ -63,7 +63,7 @@ GEM
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     cube-ruby (0.0.3)
-    date (3.3.4)
+    date (3.4.0)
     docile (1.4.1)
     domain_name (0.6.20240107)
     faraday (2.8.1)
@@ -77,8 +77,8 @@ GEM
       domain_name (~> 0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    json_pure (2.7.2)
+    json (2.8.2)
+    json_pure (2.8.1)
     libxml-ruby (5.0.3)
     logger (1.6.1)
     macaddr (1.7.2)
@@ -92,12 +92,12 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+    mime-types-data (3.2024.1105)
     mini_mime (1.1.5)
     minitest (4.7.5)
     multi_json (1.15.0)
     net-http-persistent (2.9.4)
-    net-imap (0.4.16)
+    net-imap (0.4.18)
       date
       net-protocol
     net-pop (0.1.2)
@@ -107,19 +107,19 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     netrc (0.11.0)
-    oj (3.16.6)
+    oj (3.16.7)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omni_logger (0.1.4)
       logger
-    ostruct (0.6.0)
+    ostruct (0.6.1)
     pony (1.13.1)
       mail (>= 2.0)
-    pry (0.14.2)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.1.1)
-    rack (3.1.7)
+    rack (3.1.8)
     rack-test (2.1.0)
       rack (>= 1.3)
     rake (10.5.0)
@@ -136,7 +136,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
@@ -154,7 +154,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     systemu (2.6.5)
     thread_safe (0.3.6)
-    timeout (0.4.1)
+    timeout (0.4.2)
     tzinfo (0.3.62)
     uuid (2.3.9)
       macaddr (~> 1.0)

docker-compose.yml

@@ -80,7 +80,7 @@ services:
       retries: 10
 
   mgrep-ut:
-    image: ontoportal/mgrep:0.0.2
+    image: ontoportal/mgrep:0.0.3
     platform: linux/amd64
     healthcheck:
       test: ["CMD", "nc", "-z", "-v", "127.0.0.1", "55556"]

lib/ncbo_annotator.rb

@@ -14,7 +14,6 @@
 require_relative 'ncbo_annotator/mgrep/mgrep'
 require_relative 'ncbo_annotator/config'
 require_relative 'ncbo_annotator/monkeypatches'
-require_relative 'ncbo_recommender'
 
 # Require all models
 project_root = File.dirname(File.absolute_path(__FILE__))
@@ -340,7 +339,7 @@ def create_term_cache_for_submission(logger, sub, redis=nil, redis_prefix=nil)
                                     resourceId,
                                     Annotator::Annotation::MATCH_TYPES[:type_synonym],
                                     syn,
-                                    semanticTypes) unless (syn.casecmp(prefLabel) == 0)
+                                    semanticTypes) unless (syn.to_s.casecmp(prefLabel) == 0)
                 end
                 create_term_entry(redis,
                                   redis_prefix,
@@ -662,11 +661,11 @@ def redis_last_mgrep_restart_default_timestamp()
       def create_term_entry(redis, instance_prefix, ontResourceId, resourceId, label_type, val, semanticTypes)
         begin
           # NCBO-696 - Remove case-sensitive variations on terms in annotator dictionary
-          val.upcase!()
+          val.to_s.upcase!()
         rescue ArgumentError => e
           # NCBO-832 - SCTSPA Annotator Cache building error (UTF-8)
           val = val.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-          val.upcase!()
+          val.to_s.upcase!()
         end
 
         # exclude single-character or empty/null values