cryptum 0.0.403 → 0.0.404

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c3ddca0be68aa66c07bd2f5b508e528ba5e9e8fe66d795ac248ee8fc513d17c
-  data.tar.gz: 5edc469a75086a30f35303c8f9f48a9b8abc8b7ccb59d73d1761261d93512deb
+  metadata.gz: '0913d8426c5c821f0c2d2dc00a3b18dc0d8fbb39c29c609bba2d21141221f9d9'
+  data.tar.gz: 3fdb1a3d5ca383f0ef86c0161ce3edc0c4f42132f654db0717e84d0cc1c8f839
 SHA512:
-  metadata.gz: f13fa02e5df897194257171a571f31c9a43aca37a186c1a5135ca1c7e38ecded4f0f104d90dec190bfd43d292c3c824ec85161b37de53f4fccf21dc46eb5e3e5
-  data.tar.gz: e20536c4410634a48727e02ff9068d728c637319b8ea8600336ba18051d86104183c9a9c7eb7c4a73e603e738f5e76f5ce5ceee2334b94fb0eae4628b6b44fcd
+  metadata.gz: d9d418bbbb759a3f3db5b4b2807c95936c5a114306631e053c63652b6d893e611ef2605c9a910847b51af3c291fde6ac3f1b72568a8f7c4a19b0c904778ba16d
+  data.tar.gz: d7a91468fcc01eb19588fc349bf6608b067c5f0f1f3c5138ea18ae11524cc902a7346f65d9ee04ca22a76fd204947583de38474e83e972984cd428cceb7c71a9

data/lib/cryptum/api/rest.rb

@@ -158,7 +158,7 @@ module Cryptum
         sleep 1
         retry
       rescue Interrupt, StandardError => e
-        Cryptum::Log.append(level: error, msg: e, which_self: self)
+        Cryptum::Log.append(level: :error, msg: e, which_self: self)
       end
 
       # Display Usage for this Module

data/lib/cryptum/bot_conf.rb

@@ -34,11 +34,7 @@ module Cryptum
 
       bot_conf
     rescue Errno::ENOENT, NoMethodError => 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 "#{e}\n\n\n"
-      end
+      Cryptum::Log.append(level: :error, msg: e, which_self: self, event_history: event_history)
 
       retry
     rescue Interrupt, StandardError => e
@@ -133,11 +129,7 @@ module Cryptum
 
       bot_conf
     rescue Errno::ENOENT, NoMethodError => 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 "#{e}\n\n\n"
-      end
+      Cryptum::Log.append(level: :error, msg: e, which_self: self, event_history: event_history)
 
       retry
     rescue Interrupt, StandardError => e
@@ -160,11 +152,7 @@ module Cryptum
       bot_conf[key] = value
       File.write(bot_conf_file, bot_conf.to_yaml)
     rescue Errno::ENOENT, NoMethodError => 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 "#{e}\n\n\n"
-      end
+      Cryptum::Log.append(level: :error, msg: e, which_self: self, event_history: event_history)
 
       retry
     rescue Interrupt, StandardError => e

data/lib/cryptum/log.rb

@@ -12,8 +12,20 @@ module Cryptum
       which_self = opts[:which_self].to_s
       event_history = opts[:event_history]
 
+      # Only attempt to exit gracefully if level == :error
+      exit_gracefully = false
+
+      if event_history.respond_to?('order_book')
+        session = event_history.order_book[:path].split('/').first
+        symbol = event_history.order_book[:symbol]
+      end
+
+      # Define Date / Time Format
+      datetime_str = '%Y-%m-%d %H:%M:%S.%N%z'
+
       # Always append to log file
       log_file = File.open('/tmp/cryptum.log', 'a')
+      log_file = File.open("/tmp/cryptum-ai-#{session}-#{symbol}.json", 'a') if level == :learning
 
       # Leave 10 "old" log files where
       # each file is ~ 1,024,000 bytes
@@ -22,9 +34,7 @@ module Cryptum
         10,
         1_024_000
       )
-
-      # Only attempt to exit gracefully if level == :error
-      exit_gracefully = false
+      logger.datetime_format = datetime_str
 
       case level
       when :debug
@@ -38,37 +48,49 @@ module Cryptum
         # triggered.  This prevents infintely attempting to
         # exit if something in the module fails.
         logger.level = Logger::FATAL
+      when :info, :learning
+        logger.level = Logger::INFO
       when :unknown
         logger.level = Logger::UNKNOWN
       when :warn
         logger.level = Logger::WARN
-      when :info
-        logger.level = Logger::INFO
       else
         level_error = "ERROR: Invalid log level. Valid options are:\n"
         level_error += ":info\n:warn\n:unknown\n:fatal\n:error\n:debug"
         raise level_error
       end
 
-      logger.datetime_format = '%Y-%m-%d %H:%M:%S.%N'
-      log_event = ''
-      if event_history.respond_to?('order_book')
-        log_event = "session: #{event_history.order_book[:path].split('/').first}, "
-        log_event += "symbol: #{event_history.order_book[:symbol]}"
-      end
-
-      if msg.instance_of?(Interrupt)
-        log_event += ' => CTRL+C Detected...Exiting Session.'
-        logger.level = Logger::WARN
-        exit_gracefully = true
+      if level == :learning
+        logger.formatter = proc do |_severity, datetime, progname, json_msg|
+          date = datetime.strftime(datetime_str)
+          JSON.pretty_generate(
+            date: date,
+            session: session,
+            symbol: symbol,
+            progname: progname,
+            msg: json_msg
+          )
+        end
       else
-        log_event += " => #{msg}"
-        log_event += " => \n\t#{msg.backtrace.join("\n\t")}\n\n\n" if msg.respond_to?('backtrace')
-      end
+        log_event = ''
+        if event_history.respond_to?('order_book')
+          log_event = "session: #{session}, "
+          log_event += "symbol: #{symbol}"
+        end
 
-      logger.add(logger.level, log_event, which_self)
+        if msg.instance_of?(Interrupt)
+          log_event += ' => CTRL+C Detected...Exiting Session.'
+          logger.level = Logger::WARN
+          exit_gracefully = true
+        else
+          log_event += " => #{msg}"
+          log_event += " => \n\t#{msg.backtrace.join("\n\t")}\n\n\n" if msg.respond_to?('backtrace')
+        end
 
-      Cryptum::UI::Exit.gracefully(event_history: event_history) if exit_gracefully
+        logger.add(logger.level, log_event, which_self)
+
+        Cryptum::UI::Exit.gracefully(event_history: event_history) if exit_gracefully
+      end
     rescue Interrupt, StandardError => e
       raise e
     end

data/lib/cryptum/massage.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Cryptum
+  # Load in a Data Structure and Convert Strings to Integers or Floats if Possible.
+  module Massage
+    # Supported Method Parameters::
+    # number = numeric(
+    #   struct: 'required - data structure to massage'
+    # )
+    private_class_method def self.numeric(opts = {})
+      struct = opts[:struct]
+
+      Integer(struct)
+    rescue StandardError
+      Float(struct)
+    end
+
+    # Supported Method Parameters::
+    # massaged_data = Cryptum::Massage.data(
+    #   struct: 'required - data structure to massage'
+    # )
+    public_class_method def self.data(opts = {})
+      struct = opts[:struct]
+
+      case struct
+      when String
+        begin
+          numeric(struct: struct)
+        rescue StandardError
+          struct
+        end
+      when Array
+        struct.map { |i| data(struct: i) }
+      when Hash
+        struct.merge(struct) { |_k, v| data(struct: v) }
+      else
+        struct
+      end
+    rescue Interrupt, StandardError => e
+      Cryptum::Log.append(level: :error, msg: e, which_self: self)
+    end
+
+    # Display Usage for this Module
+
+    public_class_method def self.help
+      puts "USAGE:
+        massaged_data = Cryptum::Massage.data(
+          struct: 'required - data structure to massage'
+        )
+      "
+    end
+  end
+end

data/lib/cryptum/ui/order/execute.rb

@@ -95,13 +95,19 @@ module Cryptum
 
               limit_price = last_purchase_price - quote_increment.to_f if last_purchase_price.positive? && last_purchase_price < limit_price
 
-              # Debug last order
-              File.open('/tmp/cryptum-errors.txt', 'a') do |f|
-                f.puts "Last Order: #{last_order}"
-                f.puts "Last Purchase Price: #{last_purchase_price}"
-                f.puts "Limit Price (Should be <= quote_increment-- ^): #{limit_price}"
-                f.puts "\n\n\n"
-              end
+              # Debug last order -------------------------------#
+              debug_last_order = "Last Order: #{last_order}"
+              debug_last_order += "Last Purchase Price: #{last_purchase_price}"
+              debug_last_order += "Limit Price (Should be <= quote_increment-- ^): #{limit_price}"
+              debug_last_order += "\n\n\n"
+
+              Cryptum::Log.append(
+                level: :debug,
+                msg: debug_last_order,
+                which_self: self,
+                event_history: event_history
+              )
+              #-------------------------------------------------#
 
               price = format(
                 "%0.#{fiat_smallest_decimal}f",
@@ -243,6 +249,12 @@ module Cryptum
 
               meta[:done_at] = Time.now.strftime('%Y-%m-%d %H:%M:%S.%N%z')
               meta[:color] = :green
+              Cryptum::Log.append(
+                level: :learning,
+                msg: meta,
+                which_self: self,
+                event_history: event_history
+              )
             end
           end
 

data/lib/cryptum/version.rb

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

data/lib/cryptum.rb

@@ -27,6 +27,7 @@ module Cryptum
   require 'cryptum/bot_conf'
   require 'cryptum/event'
   require 'cryptum/log'
+  require 'cryptum/massage'
   require 'cryptum/open_ai'
   require 'cryptum/option'
   require 'cryptum/order_book'

data/spec/lib/cryptum/massage_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Cryptum::Massage do
+  it 'should display information for existing help method' do
+    help_response = Cryptum::Massage
+    expect(help_response).to respond_to :help
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.403
+  version: 0.0.404
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -417,6 +417,7 @@ files:
 - lib/cryptum/event/scroll.rb
 - lib/cryptum/event/sell.rb
 - lib/cryptum/log.rb
+- lib/cryptum/massage.rb
 - lib/cryptum/open_ai.rb
 - lib/cryptum/option.rb
 - lib/cryptum/option/choice.rb
@@ -476,6 +477,7 @@ files:
 - spec/lib/cryptum/event/sell_spec.rb
 - spec/lib/cryptum/event_spec.rb
 - spec/lib/cryptum/log_spec.rb
+- spec/lib/cryptum/massage_spec.rb
 - spec/lib/cryptum/open_ai_spec.rb
 - spec/lib/cryptum/option/choice_spec.rb
 - spec/lib/cryptum/option/environment_spec.rb