bridge_api 0.1.63 → 0.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d6ea6a260943cb99e83ffdd26cf7c0e68d0d383ca31e7cd96a16065261903a
-  data.tar.gz: a8e36b9a696de1d2245dcb8bea4844a21fac2b6da185032b07101d424e66143c
+  metadata.gz: 2e33cd3207fe1494cbc64ea799f77ee399081ad6282283aaa5d577ecbe2b91c1
+  data.tar.gz: f2dea18b065d73fa9fe87598d236af598daa85d90dd884ee4b815c9f818b44d5
 SHA512:
-  metadata.gz: c9fb10e6dc27d66c2ba3273ebfd7b0770245590256d1782be1cf9398b3a61c4ef36e2af7677da48322cabc35d0ca932a2ab3828f650b523e0ba85f71e6b3db14
-  data.tar.gz: a828d6bef4d11150bd2b4968fdeb81908c06e44de3ab8fb044fff5bc09c61b586d15c466b12ca41496bb5e3d1d5990ab12464691d6b6876327b7094451fd58e8
+  metadata.gz: 89c9a1618bba16b9a707de5ca0aa056a0fc7aad2313f5304f5ba49a231be58ae89e54cdfe66e799b8f36e400f89bacac1b9b71c49fa3d40655059ebf91f8d986
+  data.tar.gz: 59c0dc141d8693cd88eb89f9dc1dcf9993beb549548afa4048781bc631c1a93e0b08b94cb9b79197ea0bc413f86b7d4177ab5fa230a6ffd5fb77fa2304429823

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+# Virtual environments with possible versions infos: https://github.com/actions/virtual-environments
+
+name: CI
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # Step 1: github action that clones the repository
+      - name: Setup Ruby # Step 2 (we gave the name 'Setup Ruby' to this step)
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5.0
+      - name: Install bundle and gems # Step 4
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+      - name: Run tests # Step 6
+        run: COVERAGE=true bundle exec rspec
+  brakeman:
+    name: runner / brakeman # Step 8
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v1
+      - name: brakeman
+        uses: reviewdog/action-brakeman@v1
+        with:
+          brakeman_version: 4.8.2
+          github_token: ${{ secrets.github_token }}
+          reporter: github-pr-review # Default is github-pr-check

data/.gitignore

@@ -4,4 +4,6 @@
 bridge_api.iml
 .byebug.*
 
-.*.gem
+.*.gem
+
+.history

data/lib/bridge_api/client/group.rb

@@ -10,6 +10,18 @@ module BridgeAPI
       def update_group(group_id, params = {})
         put("#{API_PATH}#{AUTHOR_PATH}#{GROUPS_PATH}/#{group_id}", params)
       end
+
+      def group_relevance(params = {})
+        get("#{API_PATH}#{AUTHOR_PATH}/group_relevance", params)
+      end
+
+      def update_group_relevance(params = {})
+        put("#{API_PATH}#{AUTHOR_PATH}/group_relevance", params)
+      end
+
+      def delete_group_relevance(group_id, params)
+        delete("#{API_PATH}#{AUTHOR_PATH}/group_relevance/#{group_id}", params)
+      end
     end
   end
 end

data/lib/bridge_api/client/program.rb

@@ -10,6 +10,10 @@ module BridgeAPI
       def get_program(program_id, params = {})
         get("#{API_PATH}#{AUTHOR_PATH}#{PROGRAM_PATH}/#{program_id}", params)
       end
+
+      def complete_program(program_id, params = {})
+        post("#{API_PATH}#{ADMIN_PATH}#{PROGRAM_PATH}/#{program_id}/completions", params)
+      end
     end
   end
 end

data/lib/bridge_api/client.rb

@@ -62,13 +62,6 @@ module BridgeAPI
 
     # Override Footrest request for ApiArray support
     def request(method, &block)
-      if has_token_pool?(config)
-        (config[:api_tokens] || config[:api_keys].keys).size.times do
-          break unless rate_limit_reached?
-
-          rotate_token!
-        end
-      end
       enforce_rate_limits if rate_limit_reached?
       response = connection.send(method, &block)
       apply_rate_limits(response)
@@ -80,45 +73,47 @@ module BridgeAPI
         config[:api_tokens].is_a?(Array) && config[:api_tokens].count >= 1
     end
 
-    # Since a pool is passed in, initialize first token with the first token passed in
-    def initialize_from_token_pool(config)
-      if config[:api_keys].is_a?(Hash)
-        creds = config[:api_keys].first
-        config[:api_key]    ||= creds[0]
-        config[:api_secret] ||= creds[1]
-      elsif config[:api_tokens].is_a?(Array)
-        config[:token] ||= config[:api_tokens].first
+    def convert_tokens(config)
+      return config unless config.has_key?(:api_tokens)
+      return config unless config[:api_tokens].is_a?(Array)
+      config[:api_keys] ||= {}
+      config[:api_tokens].each do |token|
+        decoded_token_array = Base64.strict_decode64(token).split(':')
+        config[:api_keys][decoded_token_array[0]] = decoded_token_array[1]
       end
+      config.delete(:api_tokens)
+      config
+    end
+
+    def initialize_from_token_pool(config)
+      config = convert_tokens(config)  
+      creds = config[:api_keys].first
+      config[:api_key]    ||= creds[0]
+      config[:api_secret] ||= creds[1]
       config
     end
 
     # rotates to the next token in the pool (by order in which they were provided)
-    def rotate_token!
-      BridgeAPI.master_mutex.synchronize do
-        old_api_key = config[:api_key]
-        if config[:api_keys].is_a?(Hash)
-          keys = config[:api_keys].keys
-          return if keys.count <= 1
-
-          key                 = get_next_key(keys, config[:api_key])
-          config[:api_key]    = key
-          config[:api_secret] = config[:api_keys][key]
-        elsif config[:api_tokens].is_a?(Array)
-          keys = config[:api_tokens]
-          return if keys.count <= 1
-
-          token = get_next_key(keys, config[:token])
-          config[:token] = token
-        end
-        BridgeAPI.logger.debug('rotating API Keys')
-        set_connection(config)
-      end
+    def rotate_token! 
+      return unless config[:api_keys].present?
+      old_api_key = config[:api_key]
+      keys = config[:api_keys].keys
+      return if keys.count <= 1
+      key                 = get_next_key(keys, config[:api_key])
+      config[:api_key]    = key
+      config[:api_secret] = config[:api_keys][key]
+      set_connection(config)
+      BridgeAPI.logger.debug("ROTATED TO KEY: #{config[:api_key]}")
     end
 
     def get_next_key(keys, current_key)
-      i = keys.index(current_key) || -1
-      i = (i + 2) > keys.count ? 0 : (i + 1)
-      keys[i]
+      keys.delete(current_key)
+      usable_key = keys.find do |key|
+        limit = rate_limit(key)
+        current_key_limit = limit.present? ? limit.fetch('current') : 0
+        BridgeAPI.beginning_rate_limit - current_key_limit > BridgeAPI.rate_limit_threshold
+      end
+      usable_key || keys[rand(keys.length)]
     end
 
     def rate_limit_reached?
@@ -130,14 +125,13 @@ module BridgeAPI
     def enforce_rate_limits
       return unless rate_limit_reached?
 
-      tts     = ((BridgeAPI.beginning_rate_limit - limit_remaining) / 5).ceil
-      tts     = BridgeAPI.min_sleep_seconds if tts < BridgeAPI.min_sleep_seconds
-      tts     = BridgeAPI.max_sleep_seconds if tts > BridgeAPI.max_sleep_seconds
-      message = "Bridge API rate limit minimum #{BridgeAPI.rate_limit_threshold} reached for key: '#{config[:api_key]}'. "\
-        "Sleeping for #{tts} second(s) to catch up ~zzZZ~. "\
-        "Limit Remaining: #{limit_remaining}"
-      BridgeAPI.logger.debug(message)
-      sleep(tts)
+      rotate_token! 
+      if rate_limit_reached?
+        sleep_time = rand(BridgeAPI.max_sleep_seconds)
+        sleep_time = BridgeAPI.min_sleep_seconds if sleep_time < BridgeAPI.min_sleep_seconds 
+        BridgeAPI.logger.debug("Rate limit reached sleeping for #{sleep_time}")
+        sleep(sleep_time)
+      end
     end
 
     def using_master_rate_limit?
@@ -148,20 +142,18 @@ module BridgeAPI
       limit = response.headers['x-rate-limit-remaining']
       return if limit.nil?
 
-      BridgeAPI.logger.debug("BRIDGE RATE LIMIT REMAINING: #{limit}")
+      BridgeAPI.logger.debug("BRIDGE RATE LIMIT REMAINING: #{limit} for key #{config[:api_key]}")
       self.limit_remaining = limit.to_i
     end
 
     def limit_remaining
       if using_master_rate_limit?
-        BridgeAPI.master_mutex.synchronize do
-          limit = PaulWalker::RateLimit.get(config[:api_key], config[:api_key])
-          if limit.nil?
-            PaulWalker::RateLimit.add(config[:api_key], config[:api_key], 0, BridgeAPI.beginning_rate_limit)
-            limit = { current: 0 }.with_indifferent_access
-          end
-          limit['current']
+        limit = rate_limit(config[:api_key])
+        if limit.nil?
+          set_rate_limit(config[:api_key], 0)
+          limit = { current: 0 }.with_indifferent_access
         end
+        limit['current']
       else
         BridgeAPI.rate_limits[config[:api_key]]
       end
@@ -169,12 +161,37 @@ module BridgeAPI
 
     def limit_remaining=(value)
       if using_master_rate_limit?
-        BridgeAPI.master_mutex.synchronize do
-          PaulWalker::RateLimit.add(config[:api_key], config[:api_key], value, BridgeAPI.beginning_rate_limit)
-        end
+        set_rate_limit(config[:api_key], value)
       else
         BridgeAPI.rate_limits[config[:api_key]] = value
       end
+      refresh_stale_tokens
+    end
+
+    def set_rate_limit(key, limit)
+      BridgeAPI.master_mutex.synchronize do
+        PaulWalker::RateLimit.add(key, key, limit, BridgeAPI.beginning_rate_limit)
+      end
+    end
+
+    def rate_limit(key)
+      BridgeAPI.master_mutex.synchronize do
+        PaulWalker::RateLimit.get(key, key)
+      end
+    end
+
+    def refresh_stale_tokens
+      return unless using_master_rate_limit?
+      return unless config[:api_keys].present?
+      api_keys = config[:api_keys].keys
+      api_keys.delete(config[:api_key])
+      api_keys.each do |key|
+        limit = rate_limit(key)
+        if limit['timestamp'].present? && DateTime.parse(limit['timestamp']) < 1.minute.ago
+          BridgeAPI.logger.debug("Refreshing: #{key}")
+          set_rate_limit(key, 0)
+        end
+      end
     end
 
     def set_connection(config)

data/lib/bridge_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BridgeAPI
-  VERSION = '0.1.63' unless defined?(BridgeAPI::VERSION)
+  VERSION = '0.1.68' unless defined?(BridgeAPI::VERSION)
 end

data/lib/bridge_api.rb

@@ -26,7 +26,7 @@ module BridgeAPI
     end
 
     def max_sleep_seconds
-      @max_sleep_seconds ||= 60
+      @max_sleep_seconds ||= 30
     end
 
     def master_rate_limit

data/spec/bridge_api/client/enrollment_spec.rb

@@ -27,12 +27,6 @@ describe BridgeAPI::Client::Enrollment do
     expect(enrollments.length).to(eq(2))
   end
 
-  it 'should update due date for enrollments' do
-    enrollment = [{ end_at: nil }]
-    response = @client.update_enrollment_due_date(1, enrollment)
-    expect(response.status).to(eq(200))
-  end
-
   it 'should reset an enrollment for a course template' do
     response = @client.reset_enrollment(1)
     expect(response.status).to(eq(204))

data/spec/bridge_api/client_spec.rb

@@ -52,7 +52,7 @@ describe BridgeAPI::Client do
     end
 
     it 'should return true for tokens' do
-      config = { prefix: 'https://www.fake.com', api_tokens: %w[token1 token2] }
+      config = { prefix: 'https://www.fake.com', api_tokens: %w[dGVzdDE6dGVzdDE= dGVzdDI6dGVzdDI=] }
       client = BridgeAPI::Client.new(config)
       expect(client.has_token_pool?(config)).to be_truthy
     end
@@ -74,10 +74,10 @@ describe BridgeAPI::Client do
     end
 
     it 'should take first from tokens' do
-      config     = { prefix: 'https://www.fake.com', api_tokens: %w[token1 token2] }
+      config     = { prefix: 'https://www.fake.com', api_tokens: %w[dGVzdDE6dGVzdDE= dGVzdDI6dGVzdDI=] }
       client     = BridgeAPI::Client.new(config)
       new_config = client.initialize_from_token_pool(config)
-      expect(new_config[:token]).to eq('token1')
+      expect(new_config[:api_key]).to eq('test1')
     end
   end
 
@@ -111,15 +111,16 @@ describe BridgeAPI::Client do
 
     context 'with token pool' do
       it 'should rotate to the next key' do
-        keys   = %w[token1 token2]
+        keys   = %w[dGVzdDE6dGVzdDE= dGVzdDI6dGVzdDI=]
         config = { prefix: 'https://www.fake.com', api_tokens: keys }
         client = BridgeAPI::Client.new(config)
-        expect(client.config[:token]).to eq('token1')
+        expect(client.config[:api_key]).to eq('test1')
         client.rotate_token!
-        expect(client.config[:token]).to eq('token2')
+        expect(client.config[:api_key]).to eq('test2')
         client.rotate_token!
-        expect(client.config[:token]).to eq('token1')
+        expect(client.config[:api_key]).to eq('test1')
       end
     end
   end
 end
+

data/spec/support/fake_bridge.rb

@@ -60,6 +60,10 @@ class FakeBridge < Sinatra::Base
     get_json_data 204, nil
   end
 
+  post %r{/api/author/programs/\d+/completions} do
+    get_json_data 204, nil
+  end
+
   delete %r{/api/author/programs/\d+/learners} do
     get_json_data 204, nil
   end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bridge_api
 version: !ruby/object:Gem::Version
-  version: 0.1.63
+  version: 0.1.68
 platform: ruby
 authors:
 - Jay Shaffer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -104,22 +104,22 @@ dependencies:
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Dockerfile
 - Gemfile
@@ -297,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Bridge API