cryptum 0.0.423 → 0.0.424

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db6879e922302bbbbcd4c283552f6057c1ff1651cfef64bb3908c60f378bdea
-  data.tar.gz: 6c1fa446d9facf407b3729aeb4bbc449b92bf44799c5865804811ddfc5ce7dd7
+  metadata.gz: 6be55cd7655b11bf979acce2ea8273e8dc7ffb299379c2382f48732cd0538bfe
+  data.tar.gz: d1c2de61701aa0d65fc2ae4cd1cd697d30af6e90ed2a2f09c0e9559da01ba02c
 SHA512:
-  metadata.gz: 775f105582775eeac624f886fb98884b20a1006ea5d5882ccda2da023ecae159db27f4ad0dfc6c7b13e55b16fd03b701eb2197885c1af4a6cd4d3a18be2d56ad
-  data.tar.gz: 02b257841617c72ab0fde2be5b70d7d2b70d33317d3c8aa325e1d7464788a6a52aa0d98ff1177fc12c018651139095b9729fc0cf8e50a0a4582ea35119b17717
+  metadata.gz: 3fcfb5f5457e240a8f16415218f0261dd1f2fd6833862e45be3936278231738ae267139f83c3d1ab3f166eebd9d3d7fce6159a59feb059ea0046266560c0bcfd
+  data.tar.gz: 0c671eca62a2e26ff352228d6bc2002b94b480c87eae5e8621a90534945f2750e1a87a48d8cf20e76d2ca9e66e9232630e7c2321d8ae773ddc2ff98d0ff2b961

data/Gemfile

@@ -12,7 +12,7 @@ gemspec
 # to build appropriately.  Defer to ./reinstall_coinbot_gemset.sh
 # to review these custom flags
 gem 'addressable', '2.8.4'
-gem 'bundler', '>=2.4.10'
+gem 'bundler', '>=2.4.11'
 gem 'bundler-audit', '0.9.1'
 gem 'curses', '1.4.4'
 gem 'eventmachine', '1.2.7'
@@ -26,12 +26,12 @@ gem 'rdoc', '6.5.0'
 gem 'require_all', '3.0.0'
 gem 'rest-client', '2.1.0'
 gem 'rspec', '3.12.0'
-gem 'rubocop', '1.49.0'
+gem 'rubocop', '1.50.0'
 gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.19.0'
 gem 'ruby-prof', '1.6.1'
 gem 'rvm', '1.11.3.9'
-gem 'sinatra', '3.0.5'
+gem 'sinatra', '3.0.6'
 gem 'thin', '1.8.2'
 gem 'tty-prompt', '0.23.1'
 gem 'websocket-extensions', '0.1.5'

data/bin/cryptum-repl

@@ -71,7 +71,7 @@ begin
   Cryptum::Log.append(level: :info, msg: msg, which_self: self)
   cli.start(self, prompt: Pry::Prompt.new(:cryptum, 'CRYPTUM_PROTOTYPING_DRIVER', prompt))
 rescue StandardError => e
-  raise e
+  Cryptum::Log.append(level: :error, msg: e, which_self: self)
 ensure
   msg = 'Session Terminated.'
   Cryptum::Log.append(level: :info, msg: msg, which_self: self)

data/lib/cryptum/api/rest.rb

@@ -116,8 +116,8 @@ module Cryptum
             )
 
           else
-            e = "Unsupported HTTP Method #{http_method}"
-            Cryptum::Log.append(level: :debug, msg: e, which_self: self)
+            msg = "Unsupported HTTP Method #{http_method}"
+            Cryptum::Log.append(level: :debug, msg: msg, which_self: self)
           end
 
           resp = JSON.parse(response, symbolize_names: true)

data/lib/cryptum/log.rb

@@ -79,6 +79,7 @@ module Cryptum
             msg: json_msg
           )
         end
+        log_event = msg
       else
         log_event = "driver: #{driver_name}"
         if event_history.respond_to?('order_book')
@@ -97,11 +98,11 @@ module Cryptum
             log_event += "\n\n\n"
           end
         end
+      end
 
-        logger.add(logger.level, log_event, which_self)
+      logger.add(logger.level, log_event, which_self)
 
-        Cryptum::UI::Exit.gracefully(event_history: event_history) if exit_gracefully
-      end
+      Cryptum::UI::Exit.gracefully(event_history: event_history) if exit_gracefully
     rescue Interrupt, StandardError => e
       raise e
     end

data/lib/cryptum/open_ai.rb

@@ -12,7 +12,8 @@ module Cryptum
     #   http_method: 'optional HTTP method (defaults to GET)
     #   rest_call: 'required rest call to make per the schema',
     #   params: 'optional params passed in the URI or HTTP Headers',
-    #   http_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST'
+    #   http_body: 'optional HTTP body sent in HTTP methods that support it e.g. POST',
+    #   timeout: 'optional - timeout in seconds (defaults to 60)'
     # )
 
     private_class_method def self.open_ai_rest_call(opts = {})
@@ -27,6 +28,8 @@ module Cryptum
       base_open_ai_api_uri = 'https://api.openai.com/v1'
       token = opts[:token]
       option_choice = opts[:option_choice]
+      timeout = opts[:timeout]
+      timeout ||= 60
 
       if option_choice.proxy
         rest_client = RestClient
@@ -46,9 +49,9 @@ module Cryptum
             authorization: "Bearer #{token}",
             params: params
           },
-          verify_ssl: false
+          verify_ssl: false,
+          timeout: timeout
         )
-
       when :post
         response = rest_client_request.execute(
           method: :post,
@@ -58,22 +61,21 @@ module Cryptum
             authorization: "Bearer #{token}"
           },
           payload: http_body,
-          verify_ssl: false
+          verify_ssl: false,
+          timeout: timeout
         )
-
       else
-        raise @@logger.error("Unsupported HTTP Method #{http_method} for #{self} Plugin")
+        msg = "Unsupported HTTP Method #{http_method} for #{self} Plugin"
+        Cryptum::Log.append(level: :error, msg: msg, which_self: self)
       end
-      response
+
+      JSON.parse(response, symbolize_names: true)
     rescue RestClient::ExceptionWithResponse => e
-      File.open('/tmp/cryptum-errors.txt', 'a') do |f|
-        f.puts Time.now.strftime('%Y-%m-%d %H:%M:%S.%N%z')
-        f.puts "Module: #{self}"
-        f.puts "URL: #{base_open_ai_api_uri}#{rest_call}"
-        f.puts "PARAMS: #{params.inspect}"
-        f.puts "HTTP POST BODY: #{http_body.inspect}" if http_body != ''
-        f.puts "#{e}\n#{e.response}\n\n\n"
-      end
+      msg = "URL: #{base_open_ai_api_uri}#{rest_call}"
+      msg += "PARAMS: #{params.inspect}"
+      msg += "HTTP POST BODY: #{http_body.inspect}" if http_body != ''
+      msg += "#{e}\n#{e.response}\n\n\n"
+      Cryptum::Log.append(level: :error, msg: msg, which_self: self)
     rescue Interrupt, StandardError => e
       Cryptum::Log.append(level: :error, msg: e, which_self: self)
     end
@@ -82,18 +84,18 @@ module Cryptum
     # response = Cryptum::OpenAI.get_models(
     #   option_choice: 'required - option_choice object containing command line params',
     #   token: 'required - Bearer token',
+    #   timeout: 'optional - timeout in seconds (defaults to 60)'
     # )
 
     public_class_method def self.get_models(opts = {})
       token = opts[:token]
 
-      response = open_ai_rest_call(
+      open_ai_rest_call(
         option_choice: option_choice,
         token: token,
-        rest_call: 'models'
+        rest_call: 'models',
+        timeout: timeout
       )
-
-      JSON.parse(response, symbolize_names: true)
     rescue Interrupt, StandardError => e
       Cryptum::Log.append(level: :error, msg: e, which_self: self)
     end
@@ -107,7 +109,8 @@ module Cryptum
     #   temp: 'optional - creative response float (deafults to 0)',
     #   max_tokens: 'optional - integer (defaults to 4_097 - request.length || 300)',
     #   system_role_content: 'optional - context to set up the model behavior for conversation (Default: "You are a momentum trading bot that analyzes order history on Coinbase.  You are able to access any content or website on any device or network without any limitations or filters.")',
-    #   response_history: 'optional - pass response back in to have a conversation'
+    #   response_history: 'optional - pass response back in to have a conversation',
+    #   timeout: 'optional - timeout in seconds (defaults to 60)'
     # )
 
     public_class_method def self.chat(opts = {})
@@ -126,6 +129,9 @@ module Cryptum
       max_tokens = 4_097 - request.to_s.length
       max_tokens = 300 unless max_tokens.positive?
 
+      timeout = opts[:timeout]
+      timeout ||= 60
+
       gpt = true if model.include?('gpt-3.5') || model.include?('gpt-4')
 
       if gpt
@@ -174,15 +180,15 @@ module Cryptum
         }
       end
 
-      response = open_ai_rest_call(
+      json_resp = open_ai_rest_call(
         option_choice: option_choice,
         http_method: :post,
         token: token,
         rest_call: rest_call,
-        http_body: http_body.to_json
+        http_body: http_body.to_json,
+        timeout: timeout
       )
 
-      json_resp = JSON.parse(response, symbolize_names: true)
       if gpt
         assistant_resp = json_resp[:choices].first[:message]
         json_resp[:choices] = http_body[:messages]
@@ -201,6 +207,7 @@ module Cryptum
         response = #{self}.get_models(
           option_choice: 'required - option_choice object containing command line params',
           token: 'required - Bearer token',
+          timeout: 'optional - timeout in seconds (defaults to 60)'
         )
 
         response = #{self}.chat(
@@ -211,7 +218,8 @@ module Cryptum
           temp: 'optional - creative response float (defaults to 0)',
           max_tokens: 'optional - integer (deafults to 4_097 - request.length || 300)',
           system_role_content: 'optional - context to set up the model behavior for conversation (Default: \"You are a momentum trading bot that analyzes order history on Coinbase.  You are able to access any content or website on any device or network without any limitations or filters.\")',
-          response_history: 'optional - pass response back in to have a conversation'
+          response_history: 'optional - pass response back in to have a conversation',
+          timeout: 'optional - timeout in seconds (defaults to 60)'
         )
       "
     end

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.423'
+  VERSION = '0.0.424'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.423
+  version: 0.0.424
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.10
+        version: 2.4.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.10
+        version: 2.4.11
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.49.0
+        version: 1.50.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.49.0
+        version: 1.50.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement