From faa3a99ace7ddffa78ccfe70829033d80e25738e Mon Sep 17 00:00:00 2001 From: Syphax Bouazzouni Date: Fri, 11 Feb 2022 09:31:29 +0100 Subject: [PATCH 01/18] fix get a submission metrics --- controllers/metrics_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/controllers/metrics_controller.rb b/controllers/metrics_controller.rb index 4b034de4..cfc476bf 100644 --- a/controllers/metrics_controller.rb +++ b/controllers/metrics_controller.rb @@ -85,7 +85,6 @@ class MetricsController < ApplicationController get "/ontologies/:ontology/metrics" do check_last_modified_collection(LinkedData::Models::Metric) ont, sub = get_ontology_and_submission - ont = Ontology.find(params["ontology"]).first error 404, "Ontology #{params['ontology']} not found" unless ont sub.bring(ontology: [:acronym], metrics: LinkedData::Models::Metric.goo_attrs_to_load(includes_param)) reply sub.metrics || {} @@ -106,10 +105,9 @@ class MetricsController < ApplicationController # reply {} end - get "/ontologies/:ontology/submissions/:submissionId/metrics" do + get "/ontologies/:ontology/submissions/:ontology_submission_id/metrics" do check_last_modified_collection(LinkedData::Models::Metric) ont, sub = get_ontology_and_submission - ont = Ontology.find(params["ontology"]).first error 404, "Ontology #{params['ontology']} not found" unless ont sub.bring(ontology: [:acronym], metrics: LinkedData::Models::Metric.goo_attrs_to_load(includes_param)) reply sub.metrics || {} From e61916922f41b5e0bbf613cb100a8cf4c5236ed1 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Fri, 5 May 2023 12:33:58 -0700 Subject: [PATCH 02/18] Restore branch specifier to master --- Gemfile | 14 +++++++------- Gemfile.lock | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index 6e777e0f..6544fbde 100644 --- a/Gemfile +++ b/Gemfile @@ -43,14 +43,14 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107 gem 'redcarpet' # NCBO -gem 'goo', github: 'ncbo/goo', branch: 'develop' -gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop' -gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop' -gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop' -gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop' -gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop' +gem 'goo', github: 'ncbo/goo', branch: 'master' +gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master' +gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master' +gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master' +gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master' +gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master' -group :development do +group :masterment do # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42 gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false gem 'capistrano', '~> 3', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 88f567e7..5c605e86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/ncbo/goo.git - revision: fb203b0396d03c1df61abfcdbc4070787010f052 - branch: develop + revision: e8816b06244c26088ef0596ddc0623562a75a284 + branch: master specs: goo (0.0.2) addressable (~> 2.8) @@ -15,8 +15,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 9fd2649b66d3bd6ef7666729d9f91087aa406266 - branch: develop + revision: 964f0680799421ab24eddc974d9f2995c6c88734 + branch: master specs: ncbo_annotator (0.0.1) goo @@ -26,8 +26,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: cd659f3ccd86562ff4d6c00a45425ca05b951169 - branch: develop + revision: c09d76eeb131caf422c18ba49580db1b47df86dc + branch: master specs: ncbo_cron (0.0.1) dante @@ -42,8 +42,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 42c7a5b242ec9e4d5d784895a27ebf377400b7b0 - branch: develop + revision: d0ac992c88bd417f2f2137ba62934c3c41b6db7c + branch: master specs: ncbo_ontology_recommender (0.0.1) goo @@ -53,8 +53,8 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 1f535313248f27170f7ecdb3450ae8247be735eb - branch: develop + revision: d858e2e29e5da84c9741b7508efa235919642e46 + branch: master specs: ontologies_linked_data (0.0.1) activesupport @@ -73,8 +73,8 @@ GIT GIT remote: https://github.com/ncbo/sparql-client.git - revision: 55e7dbf858eb571c767bc67868f9af61663859cb - branch: develop + revision: fb4a89b420f8eb6dda5190a126b6c62e32c4c0c9 + branch: master specs: sparql-client (1.0.1) json_pure (>= 1.4) From 9743042c8130096a249dd2bb66d95ffbb36f24d9 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Fri, 5 May 2023 12:36:14 -0700 Subject: [PATCH 03/18] fix for wrongly replaced string --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6544fbde..bd4615fb 100644 --- a/Gemfile +++ b/Gemfile @@ -50,7 +50,7 @@ gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branc gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master' gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master' -group :masterment do +group :development do # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42 gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false gem 'capistrano', '~> 3', require: false From 29dd13b34512d994e35a181dae85f9ff5679dfbe Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Mon, 31 Jul 2023 22:48:40 -0700 Subject: [PATCH 04/18] use patched version of agraph v7.3.1 --- .github/workflows/ruby-unit-tests.yml | 1 + Gemfile.lock | 14 +++++++------- docker-compose.yml | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ruby-unit-tests.yml b/.github/workflows/ruby-unit-tests.yml index 0d74271e..13dd5c3f 100644 --- a/.github/workflows/ruby-unit-tests.yml +++ b/.github/workflows/ruby-unit-tests.yml @@ -7,6 +7,7 @@ on: jobs: test: strategy: + fail-fast: false matrix: backend: ['api', 'api-agraph'] # api runs tests with 4store backend and api-agraph runs with AllegroGraph backend runs-on: ubuntu-latest diff --git a/Gemfile.lock b/Gemfile.lock index c2745d19..5e749fa6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: fb203b0396d03c1df61abfcdbc4070787010f052 + revision: 8e80a4f842331e874055aec6a507ca5e3be4e3a4 branch: develop specs: goo (0.0.2) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 8c8ddb6c7f9f1d2584a5fb3220f1d2aa37b66cb2 + revision: 1f81bdba54351e990047cbd6d1294c96ff0a8c6c branch: develop specs: ncbo_cron (0.0.1) @@ -53,7 +53,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 13bb138aa40ca72bfafc91a1a7416c162ba8d325 + revision: df675c44c81332a0f894b86338561b51c7f721b7 branch: develop specs: ontologies_linked_data (0.0.1) @@ -223,7 +223,7 @@ GEM redis multi_json (1.15.0) net-http-persistent (2.9.4) - net-imap (0.3.6) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) @@ -234,10 +234,10 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.3.3) net-protocol - net-ssh (7.1.0) + net-ssh (7.2.0) netrc (0.11.0) newrelic_rpm (9.3.1) - oj (3.15.0) + oj (3.15.1) omni_logger (0.1.4) logger os (1.1.4) @@ -283,7 +283,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) + rexml (3.2.6) rsolr (2.5.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) diff --git a/docker-compose.yml b/docker-compose.yml index 0997779b..76c65de5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,7 +114,8 @@ services: retries: 5 agraph-ut: - image: franzinc/agraph:v7.3.1 + #image: franzinc/agraph:v7.3.1 + image: ontoportal/agraph:v7.3.1-patch1 platform: linux/amd64 environment: - AGRAPH_SUPER_USER=test From 060b39328ef50a3d4f5f3e6b9504ee5984e0e7ee Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Mon, 31 Jul 2023 23:12:57 -0700 Subject: [PATCH 05/18] unpin faraday gem --- Gemfile | 1 - Gemfile.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index 615847d4..6e0d613e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,6 @@ source 'https://rubygems.org' gem 'activesupport', '~> 3.1' # see https://github.com/ncbo/ontologies_api/issues/69 gem 'bigdecimal', '1.4.2' -gem 'faraday', '~> 2.0' gem 'json-schema', '~> 2.0' gem 'multi_json', '~> 1.0' gem 'oj', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5e749fa6..da6886d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -357,7 +357,6 @@ DEPENDENCIES capistrano-rbenv cube-ruby ed25519 (>= 1.2, < 2.0) - faraday (~> 2.0) ffi goo! haml (~> 5.2.2) From 7c6c25bd01fc1e6ba23ba654007199af9a2d6b4f Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Mon, 7 Aug 2023 22:00:35 -0700 Subject: [PATCH 06/18] Gemfile.lock update --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 6e0d613e..7b76c8b3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'activesupport', '~> 3.1' +gem 'activesupport', '~> 3.0' # see https://github.com/ncbo/ontologies_api/issues/69 gem 'bigdecimal', '1.4.2' gem 'json-schema', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index da6886d9..7d544bfd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 8e80a4f842331e874055aec6a507ca5e3be4e3a4 + revision: 20801d66769854e254ec85ef5c14b5d87833e210 branch: develop specs: goo (0.0.2) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 1f81bdba54351e990047cbd6d1294c96ff0a8c6c + revision: 9a57e5373be9b147cd36e370f5356e6efb10e077 branch: develop specs: ncbo_cron (0.0.1) @@ -53,7 +53,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: df675c44c81332a0f894b86338561b51c7f721b7 + revision: 98bb4f71a0714a31c13de99646145bb6af5d898c branch: develop specs: ontologies_linked_data (0.0.1) @@ -103,7 +103,7 @@ GEM activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) @@ -170,8 +170,8 @@ GEM google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) grpc (~> 1.27) - googleapis-common-protos-types (1.7.0) - google-protobuf (~> 3.14) + googleapis-common-protos-types (1.8.0) + google-protobuf (~> 3.18) googleauth (1.7.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) @@ -213,9 +213,9 @@ GEM net-smtp memoist (0.16.2) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.0) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) + mime-types-data (3.2023.0808) mini_mime (1.1.2) minitest (4.7.5) minitest-stub_any_instance (1.0.3) @@ -257,7 +257,7 @@ GEM rack (>= 0.4) rack-cors (1.0.6) rack (>= 1.6.0) - rack-mini-profiler (3.1.0) + rack-mini-profiler (3.1.1) rack (>= 1.2.0) rack-protection (1.5.5) rack @@ -348,7 +348,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - activesupport (~> 3.1) + activesupport (~> 3.0) bcrypt_pbkdf (>= 1.0, < 2.0) bigdecimal (= 1.4.2) capistrano (~> 3) From d88b121bd02e18a70f91dd10b3d50450b2d0145d Mon Sep 17 00:00:00 2001 From: mdorf Date: Tue, 8 Aug 2023 13:07:43 -0700 Subject: [PATCH 07/18] fixed an issue with the GA4 Analytics migration --- controllers/ontology_analytics_controller.rb | 8 ++++++-- helpers/application_helper.rb | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/controllers/ontology_analytics_controller.rb b/controllers/ontology_analytics_controller.rb index 8ecd77d5..829708c1 100644 --- a/controllers/ontology_analytics_controller.rb +++ b/controllers/ontology_analytics_controller.rb @@ -28,7 +28,11 @@ class OntologyAnalyticsController < ApplicationController expires 86400, :public ont = Ontology.find(params["acronym"]).first error 404, "No ontology exists with the acronym: #{params["acronym"]}" if ont.nil? - analytics = ont.analytics + year = year_param(params) + error 400, "The year you supplied is invalid. Valid years start with 2 and contain 4 digits." if params["year"] && !year + month = month_param(params) + error 400, "The month you supplied is invalid. Valid months are 1-12." if params["month"] && !month + analytics = ont.analytics(year, month) if params["format"].to_s.downcase.eql?("csv") tf = Tempfile.new("analytics-#{params['acronym']}") @@ -39,7 +43,7 @@ class OntologyAnalyticsController < ApplicationController years.each do |year| months = analytics[params["acronym"]][year].keys.sort months.each do |month| - next if now.year == year && now.month <= month || (year == 2013 && month < 10) # we don't have good data going back past Oct 2013 + next if year && month && (now.year == year.to_i && now.month <= month.to_i || year.to_i == 2013 && month.to_i < 10) # we don't have good data going back past Oct 2013 visits = analytics[params["acronym"]][year][month] month = DateTime.parse("#{year}/#{month}").strftime("%b %Y") csv << [month, visits] diff --git a/helpers/application_helper.rb b/helpers/application_helper.rb index 18163099..2e811c32 100644 --- a/helpers/application_helper.rb +++ b/helpers/application_helper.rb @@ -261,9 +261,10 @@ def month_param(params=nil) if params["month"] month = params["month"].strip if %r{(?^(0[1-9]|[1-9]|1[0-2])$)}x === month - month.to_i + return month end end + nil end # validates year for starting with 1 or 2 and containing 4 digits @@ -272,9 +273,10 @@ def year_param(params=nil) if params["year"] year = params["year"].strip if %r{(?^([1-2]\d{3})$)}x === year - year.to_i + return year end end + nil end ## From dde48c2887750e6383bc6f1f22808be8296d7be3 Mon Sep 17 00:00:00 2001 From: mdorf Date: Tue, 8 Aug 2023 13:48:06 -0700 Subject: [PATCH 08/18] fixed an issue with the GA4 Analytics migration --- Gemfile.lock | 20 +- config/environments/test.rb | 2 +- helpers/application_helper.rb | 4 +- .../test_ontology_analytics_controller.rb | 240 +++++++++--------- 4 files changed, 133 insertions(+), 133 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d544bfd..822d5816 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 20801d66769854e254ec85ef5c14b5d87833e210 + revision: 6c9dfd4747297e12d9bbc1360fd148ad316ef209 branch: develop specs: goo (0.0.2) @@ -15,7 +15,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 3ae6bfb56dc59a670b5bc1a513ff4929f8cf3756 + revision: 9fd2649b66d3bd6ef7666729d9f91087aa406266 branch: develop specs: ncbo_annotator (0.0.1) @@ -42,7 +42,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 818be7ee0d6b21f52a13dc1d6068505e6e17e0c5 + revision: 42c7a5b242ec9e4d5d784895a27ebf377400b7b0 branch: develop specs: ncbo_ontology_recommender (0.0.1) @@ -105,7 +105,7 @@ GEM multi_json (~> 1.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.4.1) + airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) backports (3.24.1) bcrypt (3.1.19) @@ -162,10 +162,10 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-protobuf (3.23.4-aarch64-linux) - google-protobuf (3.23.4-arm64-darwin) - google-protobuf (3.23.4-x86_64-darwin) - google-protobuf (3.23.4-x86_64-linux) + google-protobuf (3.24.0-aarch64-linux) + google-protobuf (3.24.0-arm64-darwin) + google-protobuf (3.24.0-x86_64-darwin) + google-protobuf (3.24.0-x86_64-linux) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -216,7 +216,7 @@ GEM mime-types (3.5.0) mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) - mini_mime (1.1.2) + mini_mime (1.1.5) minitest (4.7.5) minitest-stub_any_instance (1.0.3) mlanett-redis-lock (0.2.7) @@ -398,4 +398,4 @@ DEPENDENCIES unicorn-worker-killer BUNDLED WITH - 2.4.17 + 2.3.15 diff --git a/config/environments/test.rb b/config/environments/test.rb index 4bcdf63e..6f3f0c44 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -5,7 +5,7 @@ GOO_PATH_DATA = ENV.include?("GOO_PATH_DATA") ? ENV["GOO_PATH_DATA"] : "/data/" GOO_PATH_QUERY = ENV.include?("GOO_PATH_QUERY") ? ENV["GOO_PATH_QUERY"] : "/sparql/" GOO_PATH_UPDATE = ENV.include?("GOO_PATH_UPDATE") ? ENV["GOO_PATH_UPDATE"] : "/update/" -GOO_PORT = ENV.include?("GOO_PORT") ? ENV["GOO_PORT"] : 9000 +GOO_PORT = ENV.include?("GOO_PORT") ? ENV["GOO_PORT"] : 8080 MGREP_DICTIONARY_FILE = ENV.include?("MGREP_DICTIONARY_FILE") ? ENV["MGREP_DICTIONARY_FILE"] : "./test/data/dictionary.txt" MGREP_HOST = ENV.include?("MGREP_HOST") ? ENV["MGREP_HOST"] : "localhost" MGREP_PORT = ENV.include?("MGREP_PORT") ? ENV["MGREP_PORT"] : 55555 diff --git a/helpers/application_helper.rb b/helpers/application_helper.rb index 2e811c32..b7d26990 100644 --- a/helpers/application_helper.rb +++ b/helpers/application_helper.rb @@ -261,7 +261,7 @@ def month_param(params=nil) if params["month"] month = params["month"].strip if %r{(?^(0[1-9]|[1-9]|1[0-2])$)}x === month - return month + return month.to_i.to_s end end nil @@ -273,7 +273,7 @@ def year_param(params=nil) if params["year"] year = params["year"].strip if %r{(?^([1-2]\d{3})$)}x === year - return year + return year.to_i.to_s end end nil diff --git a/test/controllers/test_ontology_analytics_controller.rb b/test/controllers/test_ontology_analytics_controller.rb index 67ab5529..b8e36dce 100644 --- a/test/controllers/test_ontology_analytics_controller.rb +++ b/test/controllers/test_ontology_analytics_controller.rb @@ -3,195 +3,195 @@ class TestOntologyAnalyticsController < TestCase ANALYTICS_DATA = { "NCIT" => { - 2013 => { - 1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0, 6 => 0, 7 => 0, 8 => 0, 9 => 0, 10 => 2850, 11 => 1631, 12 => 1323 + "2013" => { + "1" => 0, "2" => 0, "3" => 0, "4" => 0, "5" => 0, "6" => 0, "7" => 0, "8" => 0, "9" => 0, "10" => 2850, "11" => 1631, "12" => 1323 }, - 2014 => { - 1 => 1004, 2 => 1302, 3 => 2183, 4 => 2191, 5 => 1005, 6 => 1046, 7 => 1261, 8 => 1329, 9 => 1100, 10 => 956, 11 => 1105, 12 => 893 + "2014" => { + "1" => 1004, "2" => 1302, "3" => 2183, "4" => 2191, "5" => 1005, "6" => 1046, "7" => 1261, "8" => 1329, "9" => 1100, "10" => 956, "11" => 1105, "12" => 893 }, - 2015 => { - 1 => 840, 2 => 30, 3 => 50, 4 => 20, 5 => 30, 6 => 10, 7 => 100, 8 => 80, 9 => 20, 10 => 90, 11 => 200, 12 => 50 + "2015" => { + "1" => 840, "2" => 30, "3" => 50, "4" => 20, "5" => 30, "6" => 10, "7" => 100, "8" => 80, "9" => 20, "10" => 90, "11" => 200, "12" => 50 }, - 2016 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 520, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2016" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 520, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2017 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 220, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 170, 11 => 750, 12 => 730 + "2017" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 220, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 170, "11" => 750, "12" => 730 }, - 2018 => { - 1 => 2000, 2 => 220, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 120, 11 => 750, 12 => 730 + "2018" => { + "1" => 2000, "2" => 220, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 120, "11" => 750, "12" => 730 }, - 2019 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2019" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2020 => { - 1 => 2000, 2 => 210, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2020" => { + "1" => 2000, "2" => 210, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2021 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 550, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2021" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 550, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2022 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 990, 7 => 340, 8 => 320, 9 => 610, 10 => 180, 11 => 750, 12 => 730 + "2022" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 990, "7" => 340, "8" => 320, "9" => 610, "10" => 180, "11" => 750, "12" => 730 } }, "ONTOMA" => { - 2013 => { - 1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0, 6 => 0, 7 => 0, 8 => 0, 9 => 0, 10 => 6, 11 => 15, 12 => 0 + "2013" => { + "1" => 0, "2" => 0, "3" => 0, "4" => 0, "5" => 0, "6" => 0, "7" => 0, "8" => 0, "9" => 0, "10" => 6, "11" => 15, "12" => 0 }, - 2014 => { - 1 => 2, 2 => 0, 3 => 0, 4 => 2, 5 => 2, 6 => 0, 7 => 6, 8 => 8, 9 => 0, 10 => 0, 11 => 0, 12 => 2 + "2014" => { + "1" => 2, "2" => 0, "3" => 0, "4" => 2, "5" => 2, "6" => 0, "7" => 6, "8" => 8, "9" => 0, "10" => 0, "11" => 0, "12" => 2 }, - 2015 => { - 1 => 30, 2 => 90, 3 => 90, 4 => 50, 5 => 30, 6 => 20, 7 => 80, 8 => 90, 9 => 250, 10 => 230, 11 => 120, 12 => 70 + "2015" => { + "1" => 30, "2" => 90, "3" => 90, "4" => 50, "5" => 30, "6" => 20, "7" => 80, "8" => 90, "9" => 250, "10" => 230, "11" => 120, "12" => 70 }, - 2016 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 520, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2016" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 520, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2017 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 220, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 170, 11 => 750, 12 => 730 + "2017" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 220, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 170, "11" => 750, "12" => 730 }, - 2018 => { - 1 => 2000, 2 => 220, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 120, 11 => 750, 12 => 730 + "2018" => { + "1" => 2000, "2" => 220, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 120, "11" => 750, "12" => 730 }, - 2019 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2019" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2020 => { - 1 => 2000, 2 => 210, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2020" => { + "1" => 2000, "2" => 210, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2021 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 550, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2021" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 550, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2022 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 990, 7 => 340, 8 => 320, 9 => 610, 10 => 180, 11 => 750, 12 => 730 + "2022" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 990, "7" => 340, "8" => 320, "9" => 610, "10" => 180, "11" => 750, "12" => 730 } }, "CMPO" => { - 2013 => { - 1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0, 6 => 0, 7 => 0, 8 => 0, 9 => 0, 10 => 64, 11 => 75, 12 => 22 + "2013" => { + "1" => 0, "2" => 0, "3" => 0, "4" => 0, "5" => 0, "6" => 0, "7" => 0, "8" => 0, "9" => 0, "10" => 64, "11" => 75, "12" => 22 }, - 2014 => { - 1 => 15, 2 => 15, 3 => 19, 4 => 12, 5 => 13, 6 => 14, 7 => 22, 8 => 12, 9 => 36, 10 => 6, 11 => 8, 12 => 10 + "2014" => { + "1" => 15, "2" => 15, "3" => 19, "4" => 12, "5" => 13, "6" => 14, "7" => 22, "8" => 12, "9" => 36, "10" => 6, "11" => 8, "12" => 10 }, - 2015 => { - 1 => 7, 2 => 40, 3 => 140, 4 => 320, 5 => 560, 6 => 320, 7 => 210, 8 => 230, 9 => 220, 10 => 10, 11 => 220, 12 => 880 + "2015" => { + "1" => 7, "2" => 40, "3" => 140, "4" => 320, "5" => 560, "6" => 320, "7" => 210, "8" => 230, "9" => 220, "10" => 10, "11" => 220, "12" => 880 }, - 2016 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 520, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2016" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 520, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2017 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 220, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 170, 11 => 750, 12 => 30 + "2017" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 220, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 170, "11" => 750, "12" => 30 }, - 2018 => { - 1 => 2000, 2 => 220, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 120, 11 => 750, 12 => 430 + "2018" => { + "1" => 2000, "2" => 220, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 120, "11" => 750, "12" => 430 }, - 2019 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 830 + "2019" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 830 }, - 2020 => { - 1 => 2000, 2 => 210, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 380 + "2020" => { + "1" => 2000, "2" => 210, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 380 }, - 2021 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 550, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 794 + "2021" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 550, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 794 }, - 2022 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 990, 7 => 340, 8 => 320, 9 => 610, 10 => 180, 11 => 750, 12 => 738 + "2022" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 990, "7" => 340, "8" => 320, "9" => 610, "10" => 180, "11" => 750, "12" => 738 } }, "AEO" => { - 2013 => { - 1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0, 6 => 0, 7 => 0, 8 => 0, 9 => 0, 10 => 129, 11 => 142, 12 => 70 + "2013" => { + "1" => 0, "2" => 0, "3" => 0, "4" => 0, "5" => 0, "6" => 0, "7" => 0, "8" => 0, "9" => 0, "10" => 129, "11" => 142, "12" => 70 }, - 2014 => { - 1 => 116, 2 => 93, 3 => 85, 4 => 132, 5 => 96, 6 => 137, 7 => 69, 8 => 158, 9 => 123, 10 => 221, 11 => 163, 12 => 43 + "2014" => { + "1" => 116, "2" => 93, "3" => 85, "4" => 132, "5" => 96, "6" => 137, "7" => 69, "8" => 158, "9" => 123, "10" => 221, "11" => 163, "12" => 43 }, - 2015 => { - 1 => 25, 2 => 230, 3 => 330, 4 => 220, 5 => 650, 6 => 320, 7 => 840, 8 => 440, 9 => 220, 10 => 110, 11 => 210, 12 => 270 + "2015" => { + "1" => 25, "2" => 230, "3" => 330, "4" => 220, "5" => 650, "6" => 320, "7" => 840, "8" => 440, "9" => 220, "10" => 110, "11" => 210, "12" => 270 }, - 2016 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 520, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 335 + "2016" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 520, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 335 }, - 2017 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 220, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 170, 11 => 750, 12 => 732 + "2017" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 220, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 170, "11" => 750, "12" => 732 }, - 2018 => { - 1 => 2000, 2 => 220, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 120, 11 => 750, 12 => 734 + "2018" => { + "1" => 2000, "2" => 220, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 120, "11" => 750, "12" => 734 }, - 2019 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 790 + "2019" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 790 }, - 2020 => { - 1 => 2000, 2 => 210, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 350 + "2020" => { + "1" => 2000, "2" => 210, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 350 }, - 2021 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 550, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 730 + "2021" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 550, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 730 }, - 2022 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 990, 7 => 340, 8 => 320, 9 => 610, 10 => 180, 11 => 750, 12 => 730 + "2022" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 990, "7" => 340, "8" => 320, "9" => 610, "10" => 180, "11" => 750, "12" => 730 } }, "SNOMEDCT" => { - 2013 => { - 1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0, 6 => 0, 7 => 0, 8 => 0, 9 => 0, 10 => 20721, 11 => 22717, 12 => 18565 + "2013" => { + "1" => 0, "2" => 0, "3" => 0, "4" => 0, "5" => 0, "6" => 0, "7" => 0, "8" => 0, "9" => 0, "10" => 20721, "11" => 22717, "12" => 18565 }, - 2014 => { - 1 => 17966, 2 => 17212, 3 => 20942, 4 => 20376, 5 => 21063, 6 => 18734, 7 => 18116, 8 => 18676, 9 => 15728, 10 => 16348, 11 => 13933, 12 => 9533 + "2014" => { + "1" => 17966, "2" => 17212, "3" => 20942, "4" => 20376, "5" => 21063, "6" => 18734, "7" => 18116, "8" => 18676, "9" => 15728, "10" => 16348, "11" => 13933, "12" => 9533 }, - 2015 => { - 1 => 9036, 2 => 430, 3 => 550, 4 => 110, 5 => 990, 6 => 320, 7 => 630, 8 => 250, 9 => 270, 10 => 880, 11 => 330, 12 => 280 + "2015" => { + "1" => 9036, "2" => 430, "3" => 550, "4" => 110, "5" => 990, "6" => 320, "7" => 630, "8" => 250, "9" => 270, "10" => 880, "11" => 330, "12" => 280 }, - 2016 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 520, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 230 + "2016" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 520, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 230 }, - 2017 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 220, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 170, 11 => 750, 12 => 130 + "2017" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 220, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 170, "11" => 750, "12" => 130 }, - 2018 => { - 1 => 2000, 2 => 220, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 120, 11 => 750, 12 => 330 + "2018" => { + "1" => 2000, "2" => 220, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 120, "11" => 750, "12" => 330 }, - 2019 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 920 + "2019" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 920 }, - 2020 => { - 1 => 2000, 2 => 210, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 130 + "2020" => { + "1" => 2000, "2" => 210, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 130 }, - 2021 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 550, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 930 + "2021" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 550, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 930 }, - 2022 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 990, 7 => 340, 8 => 320, 9 => 610, 10 => 180, 11 => 750, 12 => 230 + "2022" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 990, "7" => 340, "8" => 320, "9" => 610, "10" => 180, "11" => 750, "12" => 230 } }, "TST" => { - 2013 => { - 1 => 0, 2 => 0, 3 => 23, 4 => 0, 5 => 0, 6 => 0, 7 => 20, 8 => 0, 9 => 0, 10 => 234, 11 => 7654, 12 => 2311 + "2013" => { + "1" => 0, "2" => 0, "3" => 23, "4" => 0, "5" => 0, "6" => 0, "7" => 20, "8" => 0, "9" => 0, "10" => 234, "11" => 7654, "12" => 2311 }, - 2014 => { - 1 => 39383, 2 => 239, 3 => 40273, 4 => 3232, 5 => 2, 6 => 58734, 7 => 11236, 8 => 23, 9 => 867, 10 => 232, 11 => 1111, 12 => 8 + "2014" => { + "1" => 39383, "2" => 239, "3" => 40273, "4" => 3232, "5" => 2, "6" => 58734, "7" => 11236, "8" => 23, "9" => 867, "10" => 232, "11" => 1111, "12" => 8 }, - 2015 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 710 + "2015" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 710 }, - 2016 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 520, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 720 + "2016" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 520, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 720 }, - 2017 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 220, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 170, 11 => 750, 12 => 73 + "2017" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 220, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 170, "11" => 750, "12" => 73 }, - 2018 => { - 1 => 2000, 2 => 220, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 120, 11 => 750, 12 => 60 + "2018" => { + "1" => 2000, "2" => 220, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 120, "11" => 750, "12" => 60 }, - 2019 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 70 + "2019" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 70 }, - 2020 => { - 1 => 2000, 2 => 210, 3 => 640, 4 => 540, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 790 + "2020" => { + "1" => 2000, "2" => 210, "3" => 640, "4" => 540, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 790 }, - 2021 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 550, 5 => 270, 6 => 980, 7 => 340, 8 => 320, 9 => 630, 10 => 110, 11 => 750, 12 => 70 + "2021" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 550, "5" => 270, "6" => 980, "7" => 340, "8" => 320, "9" => 630, "10" => 110, "11" => 750, "12" => 70 }, - 2022 => { - 1 => 2000, 2 => 230, 3 => 640, 4 => 540, 5 => 270, 6 => 990, 7 => 340, 8 => 320, 9 => 610, 10 => 180, 11 => 750, 12 => 30 + "2022" => { + "1" => 2000, "2" => 230, "3" => 640, "4" => 540, "5" => 270, "6" => 990, "7" => 340, "8" => 320, "9" => 610, "10" => 180, "11" => 750, "12" => 30 } } } From f39bb01df710a0bcdc4631e16a192bdfbbd020de Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Tue, 15 Aug 2023 12:02:06 -0700 Subject: [PATCH 09/18] reduce request limit for resource intensive api calls (#121) --- config/rack_attack.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/config/rack_attack.rb b/config/rack_attack.rb index 60d2e3de..3eae6949 100644 --- a/config/rack_attack.rb +++ b/config/rack_attack.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true -puts "(API) >> Throttling enabled at #{LinkedData::OntologiesAPI.settings.req_per_second_per_ip} req/sec" +limit_req_ip = LinkedData::OntologiesAPI.settings.req_per_second_per_ip +limit_req_ip_heavy = limit_req_ip / 5 +puts "(API) >> Throttling enabled at #{limit_req_ip} req/sec" require 'rack/attack' require 'redis-activesupport' @@ -28,11 +30,12 @@ request.env['REMOTE_USER']&.admin? end -Rack::Attack.throttle('requests by ip', - limit: LinkedData::OntologiesAPI.settings.req_per_second_per_ip, - period: 1.second -) do |request| - request.ip +Rack::Attack.throttle('req/ip/heavy', limit: limit_req_ip_heavy, period: 1.second) do |req| + req.ip if req.path.include?('/recommender') || req.path.include?('/annotator') +end + +Rack::Attack.throttle('req/ip', limit: limit_req_ip, period: 1.second) do |req| + req.ip end Rack::Attack.throttled_responder = lambda do |request| From ac4223893f2a9a3cd50acb8ae49a19dd7b7134dc Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Wed, 30 Aug 2023 16:41:23 -0700 Subject: [PATCH 10/18] Announce deployments in NewRelic (#124) * Record deployments to NewRelic https://docs.newrelic.com/docs/apm/agents/ruby-agent/features/record-deployments-ruby-agent/ * add newrelic to deployment group github actions deployment doesn't install default group so capistrano fails to find newrelic recepies unless we add it to the deployment group * add rubocop --- Capfile | 2 +- Gemfile | 10 +++++++--- Gemfile.lock | 28 +++++++++++++++++++++++++++- config/deploy.rb | 1 + 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/Capfile b/Capfile index f86314f3..7ecc995c 100644 --- a/Capfile +++ b/Capfile @@ -22,6 +22,6 @@ require 'capistrano/bundler' # require 'capistrano/rails/assets' # require 'capistrano/rails/migrations' require 'capistrano/locally' - +require 'new_relic/recipes' # announce deployments in NewRelic # Loads custom tasks from `lib/capistrano/tasks' if you have any defined. Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } diff --git a/Gemfile b/Gemfile index 7b76c8b3..2236aee2 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'redis-store', '1.9.1' # remove after https://github.com/redis-store/redis-s # Monitoring gem 'cube-ruby', require: 'cube' -gem 'newrelic_rpm' +gem 'newrelic_rpm', group: [:default, :deployment] # HTTP server gem 'unicorn' @@ -50,6 +50,12 @@ gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'de gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop' group :development do + # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42 + gem 'shotgun', github: 'palexander/shotgun', branch: 'ncbo' + gem 'rubocop' +end + +group :deployment do # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42 gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false gem 'capistrano', '~> 3', require: false @@ -57,8 +63,6 @@ group :development do gem 'capistrano-locally', require: false gem 'capistrano-rbenv', require: false gem 'ed25519', '>= 1.2', '< 2.0', require: false - gem 'pry' - gem 'shotgun', github: 'palexander/shotgun', branch: 'ncbo' end group :profiling do diff --git a/Gemfile.lock b/Gemfile.lock index 822d5816..5affb200 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,7 +107,9 @@ GEM public_suffix (>= 2.0.2, < 6.0) airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) + ast (2.4.2) backports (3.24.1) + base64 (0.1.1) bcrypt (3.1.19) bcrypt_pbkdf (1.1.0) bigdecimal (1.4.2) @@ -202,6 +204,7 @@ GEM json_pure (2.6.3) jwt (2.7.1) kgio (2.11.4) + language_server-protocol (3.17.0.3) libxml-ruby (4.1.1) logger (1.5.3) macaddr (1.7.2) @@ -241,13 +244,18 @@ GEM omni_logger (0.1.4) logger os (1.1.4) + parallel (1.23.0) parseconfig (1.1.2) + parser (3.2.2.3) + ast (~> 2.4.1) + racc pony (1.13.1) mail (>= 2.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.3) + racc (1.7.1) rack (1.6.13) rack-accept (0.4.5) rack (>= 0.4) @@ -264,6 +272,7 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) + rainbow (3.1.1) raindrops (0.20.1) rake (10.5.0) rdf (1.0.8) @@ -278,6 +287,7 @@ GEM redis-store (>= 1.6, < 2) redis-store (1.9.1) redis (>= 4, < 5) + regexp_parser (2.8.1) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -287,6 +297,21 @@ GEM rsolr (2.5.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) + rubocop (1.56.2) + base64 (~> 0.1.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) ruby-xxHash (0.4.0.2) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -331,6 +356,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) + unicode-display_width (2.4.2) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -371,7 +397,6 @@ DEPENDENCIES oj (~> 3.0) ontologies_linked_data! parseconfig - pry rack rack-accept (~> 0.4) rack-attack (~> 6.6.1) @@ -387,6 +412,7 @@ DEPENDENCIES redis-activesupport redis-rack-cache (~> 2.0) redis-store (= 1.9.1) + rubocop shotgun! simplecov simplecov-cobertura diff --git a/config/deploy.rb b/config/deploy.rb index 23a982cd..6b051216 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -108,6 +108,7 @@ after :publishing, :get_config after :get_config, :restart # after :deploy, :smoke_test + after :restart, "newrelic:notice_deployment" after :restart, :clear_cache do on roles(:web), in: :groups, limit: 3, wait: 10 do From 074ddfacc345c6c8738cde0e100838a7af97a466 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Tue, 5 Sep 2023 21:52:21 -0700 Subject: [PATCH 11/18] Gemfile update, goo version including goo#138 and goo#139 --- Gemfile.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5affb200..413debb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 6c9dfd4747297e12d9bbc1360fd148ad316ef209 + revision: 911d71aefe433314d11398445e3856fca503b9c1 branch: develop specs: goo (0.0.2) @@ -15,7 +15,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 9fd2649b66d3bd6ef7666729d9f91087aa406266 + revision: 3ae6bfb56dc59a670b5bc1a513ff4929f8cf3756 branch: develop specs: ncbo_annotator (0.0.1) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 9a57e5373be9b147cd36e370f5356e6efb10e077 + revision: 656b3ac6ae66c5bc60cb9d97d5ed0009b1b703e0 branch: develop specs: ncbo_cron (0.0.1) @@ -42,7 +42,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 42c7a5b242ec9e4d5d784895a27ebf377400b7b0 + revision: 818be7ee0d6b21f52a13dc1d6068505e6e17e0c5 branch: develop specs: ncbo_ontology_recommender (0.0.1) @@ -53,7 +53,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 98bb4f71a0714a31c13de99646145bb6af5d898c + revision: 69b6e60312adf125638ab3d1dd31c9ace0712eff branch: develop specs: ontologies_linked_data (0.0.1) @@ -142,7 +142,7 @@ GEM faraday-retry (2.2.0) faraday (~> 2.0) ffi (1.15.5) - gapic-common (0.19.1) + gapic-common (0.20.0) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) google-protobuf (~> 3.14) @@ -155,7 +155,7 @@ GEM google-analytics-data (0.4.0) google-analytics-data-v1beta (>= 0.7, < 2.a) google-cloud-core (~> 1.6) - google-analytics-data-v1beta (0.8.0) + google-analytics-data-v1beta (0.8.1) gapic-common (>= 0.19.1, < 2.a) google-cloud-errors (~> 1.0) google-cloud-core (1.6.0) @@ -164,10 +164,10 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-protobuf (3.24.0-aarch64-linux) - google-protobuf (3.24.0-arm64-darwin) - google-protobuf (3.24.0-x86_64-darwin) - google-protobuf (3.24.0-x86_64-linux) + google-protobuf (3.24.2-aarch64-linux) + google-protobuf (3.24.2-arm64-darwin) + google-protobuf (3.24.2-x86_64-darwin) + google-protobuf (3.24.2-x86_64-linux) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -181,13 +181,13 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.56.2) + grpc (1.57.0) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) - grpc (1.56.2-x86_64-darwin) + grpc (1.57.0-x86_64-darwin) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) - grpc (1.56.2-x86_64-linux) + grpc (1.57.0-x86_64-linux) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) haml (5.2.2) @@ -216,7 +216,7 @@ GEM net-smtp memoist (0.16.2) method_source (1.0.0) - mime-types (3.5.0) + mime-types (3.5.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) mini_mime (1.1.5) @@ -239,8 +239,8 @@ GEM net-protocol net-ssh (7.2.0) netrc (0.11.0) - newrelic_rpm (9.3.1) - oj (3.15.1) + newrelic_rpm (9.4.2) + oj (3.16.1) omni_logger (0.1.4) logger os (1.1.4) From 436eedb4c4204c287391ac4ec976244794706a65 Mon Sep 17 00:00:00 2001 From: mdorf Date: Wed, 6 Sep 2023 12:36:01 -0700 Subject: [PATCH 12/18] Gemfile.lock update --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 413debb1..0413b923 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 3ae6bfb56dc59a670b5bc1a513ff4929f8cf3756 + revision: 9fd2649b66d3bd6ef7666729d9f91087aa406266 branch: develop specs: ncbo_annotator (0.0.1) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 656b3ac6ae66c5bc60cb9d97d5ed0009b1b703e0 + revision: 9a57e5373be9b147cd36e370f5356e6efb10e077 branch: develop specs: ncbo_cron (0.0.1) @@ -42,7 +42,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 818be7ee0d6b21f52a13dc1d6068505e6e17e0c5 + revision: 42c7a5b242ec9e4d5d784895a27ebf377400b7b0 branch: develop specs: ncbo_ontology_recommender (0.0.1) @@ -53,7 +53,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 69b6e60312adf125638ab3d1dd31c9ace0712eff + revision: e33a0e451f8a8226d98291168e45b46d7065e670 branch: develop specs: ontologies_linked_data (0.0.1) @@ -317,7 +317,7 @@ GEM rubyzip (2.3.2) rufus-scheduler (2.0.24) tzinfo (>= 0.3.22) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) From ed3f3442fc95689dc9eb75568bb268155af6d17e Mon Sep 17 00:00:00 2001 From: mdorf Date: Wed, 6 Sep 2023 12:38:28 -0700 Subject: [PATCH 13/18] Gemfile.lock update --- Gemfile.lock | 81 ++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 50 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 911fc928..2b48a3be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 59fa167d6e8d2cb55bd0d574d029057f46cbc594 + revision: 8da0cd77cf0048f771a35829d47d08bd94d9989f branch: master specs: goo (0.0.2) @@ -15,7 +15,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: f4aa1c394359500b50dbc6b0b636e9fd6da93275 + revision: 964f0680799421ab24eddc974d9f2995c6c88734 branch: master specs: ncbo_annotator (0.0.1) @@ -26,13 +26,13 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 20394e60105d31682cd28dbbe2698cfbff03bdfe + revision: 6db9916caf99cb839fc5996eabae4e48a5ac13f2 branch: master specs: ncbo_cron (0.0.1) dante goo - google-analytics-data + google-apis-analytics_v3 mlanett-redis-lock multi_json ncbo_annotator @@ -42,7 +42,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 83e835de368bc9f19da800a477982e0ad770900d + revision: d0ac992c88bd417f2f2137ba62934c3c41b6db7c branch: master specs: ncbo_ontology_recommender (0.0.1) @@ -53,7 +53,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: 0cdb8f84a4d8b19fdcebcaabb2e4968a63809863 + revision: aae2e20bffe346aaf66815e716654f51a7870bd5 branch: master specs: ontologies_linked_data (0.0.1) @@ -131,6 +131,7 @@ GEM cube-ruby (0.0.3) dante (0.2.0) date (3.3.3) + declarative (0.0.20) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -139,40 +140,20 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - faraday-retry (2.2.0) - faraday (~> 2.0) ffi (1.15.5) - gapic-common (0.19.1) - faraday (>= 1.9, < 3.a) - faraday-retry (>= 1.0, < 3.a) - google-protobuf (~> 3.14) - googleapis-common-protos (>= 1.3.12, < 2.a) - googleapis-common-protos-types (>= 1.3.1, < 2.a) - googleauth (~> 1.0) - grpc (~> 1.36) get_process_mem (0.2.7) ffi (~> 1.0) - google-analytics-data (0.4.0) - google-analytics-data-v1beta (>= 0.7, < 2.a) - google-cloud-core (~> 1.6) - google-analytics-data-v1beta (0.8.0) - gapic-common (>= 0.19.1, < 2.a) - google-cloud-errors (~> 1.0) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-protobuf (3.24.0-aarch64-linux) - google-protobuf (3.24.0-x86_64-darwin) - google-protobuf (3.24.0-x86_64-linux) - googleapis-common-protos (1.4.0) - google-protobuf (~> 3.14) - googleapis-common-protos-types (~> 1.2) - grpc (~> 1.27) - googleapis-common-protos-types (1.8.0) - google-protobuf (~> 3.18) + google-apis-analytics_v3 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick googleauth (1.7.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) @@ -180,21 +161,13 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.56.2) - google-protobuf (~> 3.23) - googleapis-common-protos-types (~> 1.0) - grpc (1.56.2-x86_64-darwin) - google-protobuf (~> 3.23) - googleapis-common-protos-types (~> 1.0) - grpc (1.56.2-x86_64-linux) - google-protobuf (~> 3.23) - googleapis-common-protos-types (~> 1.0) haml (5.2.2) temple (>= 0.8.0) tilt http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) + httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.6.3) @@ -215,7 +188,7 @@ GEM net-smtp memoist (0.16.2) method_source (1.0.0) - mime-types (3.5.0) + mime-types (3.5.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0808) mini_mime (1.1.5) @@ -238,8 +211,8 @@ GEM net-protocol net-ssh (7.2.0) netrc (0.11.0) - newrelic_rpm (9.3.1) - oj (3.15.1) + newrelic_rpm (9.4.2) + oj (3.16.1) omni_logger (0.1.4) logger os (1.1.4) @@ -287,11 +260,16 @@ GEM redis-store (1.9.1) redis (>= 4, < 5) regexp_parser (2.8.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + retriable (3.1.2) rexml (3.2.6) rsolr (2.5.0) builder (>= 2.1.2) @@ -316,7 +294,7 @@ GEM rubyzip (2.3.2) rufus-scheduler (2.0.24) tzinfo (>= 0.3.22) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -350,8 +328,10 @@ GEM temple (0.10.2) tilt (2.2.0) timeout (0.4.0) + trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -364,6 +344,7 @@ GEM unicorn (>= 4, < 7) uuid (2.3.9) macaddr (~> 1.0) + webrick (1.8.1) PLATFORMS aarch64-linux From e9cc25d35085814937776537b658199c18243b07 Mon Sep 17 00:00:00 2001 From: mdorf Date: Wed, 6 Sep 2023 12:45:17 -0700 Subject: [PATCH 14/18] Gemfile.lock update --- Gemfile | 12 ++++---- Gemfile.lock | 87 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 59 insertions(+), 40 deletions(-) diff --git a/Gemfile b/Gemfile index 568b5b35..2236aee2 100644 --- a/Gemfile +++ b/Gemfile @@ -42,12 +42,12 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107 gem 'redcarpet' # NCBO -gem 'goo', github: 'ncbo/goo', branch: 'master' -gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master' -gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master' -gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master' -gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master' -gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master' +gem 'goo', github: 'ncbo/goo', branch: 'develop' +gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop' +gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop' +gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop' +gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop' +gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop' group :development do # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42 diff --git a/Gemfile.lock b/Gemfile.lock index 2b48a3be..7fc0bd23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 8da0cd77cf0048f771a35829d47d08bd94d9989f - branch: master + revision: 911d71aefe433314d11398445e3856fca503b9c1 + branch: develop specs: goo (0.0.2) addressable (~> 2.8) @@ -15,8 +15,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 964f0680799421ab24eddc974d9f2995c6c88734 - branch: master + revision: 9fd2649b66d3bd6ef7666729d9f91087aa406266 + branch: develop specs: ncbo_annotator (0.0.1) goo @@ -26,13 +26,13 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 6db9916caf99cb839fc5996eabae4e48a5ac13f2 - branch: master + revision: 9a57e5373be9b147cd36e370f5356e6efb10e077 + branch: develop specs: ncbo_cron (0.0.1) dante goo - google-apis-analytics_v3 + google-analytics-data mlanett-redis-lock multi_json ncbo_annotator @@ -42,8 +42,8 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: d0ac992c88bd417f2f2137ba62934c3c41b6db7c - branch: master + revision: 42c7a5b242ec9e4d5d784895a27ebf377400b7b0 + branch: develop specs: ncbo_ontology_recommender (0.0.1) goo @@ -53,8 +53,8 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: aae2e20bffe346aaf66815e716654f51a7870bd5 - branch: master + revision: e33a0e451f8a8226d98291168e45b46d7065e670 + branch: develop specs: ontologies_linked_data (0.0.1) activesupport @@ -73,8 +73,8 @@ GIT GIT remote: https://github.com/ncbo/sparql-client.git - revision: fb4a89b420f8eb6dda5190a126b6c62e32c4c0c9 - branch: master + revision: 55e7dbf858eb571c767bc67868f9af61663859cb + branch: develop specs: sparql-client (1.0.1) json_pure (>= 1.4) @@ -131,7 +131,6 @@ GEM cube-ruby (0.0.3) dante (0.2.0) date (3.3.3) - declarative (0.0.20) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -140,20 +139,40 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) + faraday-retry (2.2.0) + faraday (~> 2.0) ffi (1.15.5) + gapic-common (0.20.0) + faraday (>= 1.9, < 3.a) + faraday-retry (>= 1.0, < 3.a) + google-protobuf (~> 3.14) + googleapis-common-protos (>= 1.3.12, < 2.a) + googleapis-common-protos-types (>= 1.3.1, < 2.a) + googleauth (~> 1.0) + grpc (~> 1.36) get_process_mem (0.2.7) ffi (~> 1.0) - google-apis-analytics_v3 (0.13.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick + google-analytics-data (0.4.0) + google-analytics-data-v1beta (>= 0.7, < 2.a) + google-cloud-core (~> 1.6) + google-analytics-data-v1beta (0.8.1) + gapic-common (>= 0.19.1, < 2.a) + google-cloud-errors (~> 1.0) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.1) + google-protobuf (3.24.2-aarch64-linux) + google-protobuf (3.24.2-x86_64-darwin) + google-protobuf (3.24.2-x86_64-linux) + googleapis-common-protos (1.4.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.2) + grpc (~> 1.27) + googleapis-common-protos-types (1.8.0) + google-protobuf (~> 3.18) googleauth (1.7.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) @@ -161,13 +180,21 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) + grpc (1.57.0) + google-protobuf (~> 3.23) + googleapis-common-protos-types (~> 1.0) + grpc (1.57.0-x86_64-darwin) + google-protobuf (~> 3.23) + googleapis-common-protos-types (~> 1.0) + grpc (1.57.0-x86_64-linux) + google-protobuf (~> 3.23) + googleapis-common-protos-types (~> 1.0) haml (5.2.2) temple (>= 0.8.0) tilt http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.6.3) @@ -260,16 +287,11 @@ GEM redis-store (1.9.1) redis (>= 4, < 5) regexp_parser (2.8.1) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (3.1.2) rexml (3.2.6) rsolr (2.5.0) builder (>= 2.1.2) @@ -328,10 +350,8 @@ GEM temple (0.10.2) tilt (2.2.0) timeout (0.4.0) - trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -344,7 +364,6 @@ GEM unicorn (>= 4, < 7) uuid (2.3.9) macaddr (~> 1.0) - webrick (1.8.1) PLATFORMS aarch64-linux From 5ad69e860c1c04ef7dd264d1ee68bfcfdd02ffc1 Mon Sep 17 00:00:00 2001 From: mdorf Date: Thu, 7 Sep 2023 16:46:06 -0700 Subject: [PATCH 15/18] Gemfile.lock update --- Gemfile.lock | 12 ++++++------ docker-compose.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7fc0bd23..b151c395 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 9fd2649b66d3bd6ef7666729d9f91087aa406266 + revision: 3ae6bfb56dc59a670b5bc1a513ff4929f8cf3756 branch: develop specs: ncbo_annotator (0.0.1) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 9a57e5373be9b147cd36e370f5356e6efb10e077 + revision: 656b3ac6ae66c5bc60cb9d97d5ed0009b1b703e0 branch: develop specs: ncbo_cron (0.0.1) @@ -42,7 +42,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 42c7a5b242ec9e4d5d784895a27ebf377400b7b0 + revision: 818be7ee0d6b21f52a13dc1d6068505e6e17e0c5 branch: develop specs: ncbo_ontology_recommender (0.0.1) @@ -164,9 +164,9 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-protobuf (3.24.2-aarch64-linux) - google-protobuf (3.24.2-x86_64-darwin) - google-protobuf (3.24.2-x86_64-linux) + google-protobuf (3.24.3-aarch64-linux) + google-protobuf (3.24.3-x86_64-darwin) + google-protobuf (3.24.3-x86_64-linux) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) diff --git a/docker-compose.yml b/docker-compose.yml index 76c65de5..d5c224d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ x-app: &app # api code - .:/srv/ontoportal/ontologies_api # mount directory containing development version of the gems if you need to use 'bundle config local' - #- /Users/alexskr/ontoportal:/Users/alexskr/ontoportal + - /Users/mdorf/dev/ncbo:/Users/mdorf/dev/ncbo depends_on: &depends_on solr-ut: condition: service_healthy From ca8a3fb0d2dcab5738e5ee5c3ebcc7851763593f Mon Sep 17 00:00:00 2001 From: mdorf Date: Thu, 7 Sep 2023 16:47:37 -0700 Subject: [PATCH 16/18] fixed an accidental commit of docker compose file --- Gemfile.lock | 16 ++++------------ docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b151c395..8ead8d9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ncbo/goo.git - revision: 911d71aefe433314d11398445e3856fca503b9c1 + revision: 83425ba6c05d051d86c6f5775540727ce4238443 branch: develop specs: goo (0.0.2) @@ -15,7 +15,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_annotator.git - revision: 3ae6bfb56dc59a670b5bc1a513ff4929f8cf3756 + revision: 067104ae94c0e9d058cfbf419364fbf03f34de43 branch: develop specs: ncbo_annotator (0.0.1) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_cron.git - revision: 656b3ac6ae66c5bc60cb9d97d5ed0009b1b703e0 + revision: ed14911ccb28375298c63e7ca1b388ed0c638abb branch: develop specs: ncbo_cron (0.0.1) @@ -42,7 +42,7 @@ GIT GIT remote: https://github.com/ncbo/ncbo_ontology_recommender.git - revision: 818be7ee0d6b21f52a13dc1d6068505e6e17e0c5 + revision: e6d4449d8b854f17bb54af6de142bc64bff22ab3 branch: develop specs: ncbo_ontology_recommender (0.0.1) @@ -164,9 +164,7 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-protobuf (3.24.3-aarch64-linux) google-protobuf (3.24.3-x86_64-darwin) - google-protobuf (3.24.3-x86_64-linux) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -180,15 +178,9 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.57.0) - google-protobuf (~> 3.23) - googleapis-common-protos-types (~> 1.0) grpc (1.57.0-x86_64-darwin) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) - grpc (1.57.0-x86_64-linux) - google-protobuf (~> 3.23) - googleapis-common-protos-types (~> 1.0) haml (5.2.2) temple (>= 0.8.0) tilt diff --git a/docker-compose.yml b/docker-compose.yml index d5c224d1..76c65de5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ x-app: &app # api code - .:/srv/ontoportal/ontologies_api # mount directory containing development version of the gems if you need to use 'bundle config local' - - /Users/mdorf/dev/ncbo:/Users/mdorf/dev/ncbo + #- /Users/alexskr/ontoportal:/Users/alexskr/ontoportal depends_on: &depends_on solr-ut: condition: service_healthy From 665226806fd0ffc55833c140b9db8bd23009b755 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Fri, 8 Sep 2023 09:52:19 -0700 Subject: [PATCH 17/18] update Gemfile.lock --- Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 8ead8d9b..9606596f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,9 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) + google-protobuf (3.24.3-aarch64-linux) google-protobuf (3.24.3-x86_64-darwin) + google-protobuf (3.24.3-x86_64-linux) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -178,9 +180,15 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) + grpc (1.57.0) + google-protobuf (~> 3.23) + googleapis-common-protos-types (~> 1.0) grpc (1.57.0-x86_64-darwin) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) + grpc (1.57.0-x86_64-linux) + google-protobuf (~> 3.23) + googleapis-common-protos-types (~> 1.0) haml (5.2.2) temple (>= 0.8.0) tilt From 90ecfb853c307df011a5c0bd90e3e1352e6166d8 Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Sun, 10 Sep 2023 23:09:01 -0700 Subject: [PATCH 18/18] Gemfile.lock update --- Gemfile.lock | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9606596f..fea1e4f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,7 +53,7 @@ GIT GIT remote: https://github.com/ncbo/ontologies_linked_data.git - revision: e33a0e451f8a8226d98291168e45b46d7065e670 + revision: 711ebf27722355a25a0e53a8204b4ae472902bd0 branch: develop specs: ontologies_linked_data (0.0.1) @@ -173,20 +173,19 @@ GEM grpc (~> 1.27) googleapis-common-protos-types (1.8.0) google-protobuf (~> 3.18) - googleauth (1.7.0) + googleauth (1.8.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grpc (1.57.0) + grpc (1.58.0) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) - grpc (1.57.0-x86_64-darwin) + grpc (1.58.0-x86_64-darwin) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) - grpc (1.57.0-x86_64-linux) + grpc (1.58.0-x86_64-linux) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) haml (5.2.2) @@ -213,7 +212,6 @@ GEM net-imap net-pop net-smtp - memoist (0.16.2) method_source (1.0.0) mime-types (3.5.1) mime-types-data (~> 3.2015) @@ -367,7 +365,6 @@ GEM PLATFORMS aarch64-linux - x86_64-darwin-18 x86_64-darwin-21 x86_64-linux @@ -422,4 +419,4 @@ DEPENDENCIES unicorn-worker-killer BUNDLED WITH - 2.3.15 + 2.4.17