appydave-tools 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c99bf6126fd82479ca9280e75f8d5c9226b1e8f6df4f6f581476363fd45245
-  data.tar.gz: 2f171fac8f490c259e6d259c848af330f3b7c4c1a35aea456fcc85251224f69e
+  metadata.gz: be09bb7513f3d614e12ff5868087d7c39f5c68f4f0ac43a87725a85cdba84e00
+  data.tar.gz: a9e33a415aa1bf242a29e4771f418583a38d22a8010103ae6ff7883000fb15ae
 SHA512:
-  metadata.gz: 06227ef4baf7765404e787a91dd53728032cfcea6718b36d19bb378f35b754eabd365d1a2eea270299f6b2fb2ab98bfa529feff71426fd78b0968768c23131b2
-  data.tar.gz: 6ac8d46c1f8afb609faf5145fe864e24b09de807691295eef2613029c0ebcfb30f92adbb60a437e810b14b7ba841e1e1bb5cb1499ca5fab5b7864907e91b4e53
+  metadata.gz: 75c8a86342447e20e44f85bf82ea1796e3c5e9f125d4115e5a2b2317d831cacafd371bd3c0b097648e0dd8d20329900bb313d7f015cff6bd718d2074e013956d
+  data.tar.gz: 96f4839ea4e970747d056c676375bf730243b6f02894be86f9e056afbf54cd4584692d4b7ac3ebbf4ab99c4aa970622f3c7caacf2e408a16bb1493316fb58960

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.10.2](https://github.com/klueless-io/appydave-tools/compare/v0.10.1...v0.10.2) (2024-06-17)
+
+
+### Bug Fixes
+
+* make progress on prompt completion tool ([fbc60b7](https://github.com/klueless-io/appydave-tools/commit/fbc60b712e3e18d7f73c47f4568bae65295557df))
+
 ## [0.10.1](https://github.com/klueless-io/appydave-tools/compare/v0.10.0...v0.10.1) (2024-06-13)
 
 

data/bin/bank_reconciliation.rb

@@ -48,6 +48,10 @@ class BankReconciliationCLI
         options[:output] = v
       end
 
+      opts.on('-d', '--debug', 'Enable debug mode') do
+        options[:debug] = true
+      end
+
       opts.on_tail('-h', '--help', 'Show this message') do
         puts opts
         exit
@@ -58,17 +62,15 @@ class BankReconciliationCLI
     output_file = options[:output] || 'clean_transactions.csv'
     include_patterns = options[:include].empty? ? ['*'] : options[:include]
 
-    puts "Cleaning transactions with options: #{options}"
+    # puts "Cleaning transactions with options: #{options}"
 
     # Ensure the clean directory exists
     clean_dir = File.dirname(output_file)
     FileUtils.mkdir_p(clean_dir)
 
     # Initialize the CleanTransactions class and process the files
-    cleaner = Appydave::Tools::BankReconciliation::Clean::CleanTransactions.new(transaction_folder: transaction_folder)
+    cleaner = Appydave::Tools::BankReconciliation::Clean::CleanTransactions.new(transaction_folder: transaction_folder, debug: options[:debug])
     cleaner.clean_transactions(include_patterns, output_file)
-
-    puts "Cleaning transactions with options: #{options}"
   end
 
   def process_transactions(args)
@@ -76,6 +78,7 @@ class BankReconciliationCLI
     OptionParser.new do |opts|
       opts.banner = 'Usage: bank_reconciliation.rb process [options]'
       opts.on('-i', '--input FILE', 'Input CSV file with transactions') { |v| options[:input] = v }
+      opts.on('-d', '--debug', 'Enable debug mode') { |v| options[:debug] = v }
       opts.on_tail('-h', '--help', 'Show this message') do
         puts opts
         exit
@@ -96,8 +99,9 @@ class BankReconciliationCLI
       opts.on('-e', '--end DATE', 'Filter by dates less than or eqaul to DDMMYY') { |v| options[:year] = v }
       opts.on('-c', '--codes CODES', 'Filter by chart of account codes (comma-separated)') { |v| options[:codes] = v }
       opts.on('-w', '--wild TEXT', 'Wildcard text match') { |v| options[:text] = v }
-      opts.on('-d', '--display', 'Display filtered transactions in table format') { |v| options[:display] = v }
+      opts.on('-v', '--view', 'Display filtered transactions in table format') { |v| options[:display] = v }
       opts.on('-o', '--output FILE', 'Output CSV file name') { |v| options[:output] = v }
+      opts.on('-d', '--debug', 'Enable debug mode') { |v| options[:debug] = v }
       opts.on_tail('-h', '--help', 'Show this message') do
         puts opts
         exit

data/lib/appydave/tools/bank_reconciliation/clean/clean_transactions.rb

@@ -6,15 +6,17 @@ module Appydave
       module Clean
         # Clean transactions
         class CleanTransactions
-          include Appydave::Tools::Configuration::Configurable
           include KLog::Logging
+          include Appydave::Tools::Configuration::Configurable
+          include Appydave::Tools::Debuggable
 
           attr_reader :transaction_folder
           attr_reader :output_folder
           attr_reader :transactions
 
           # (config_file)
-          def initialize(transaction_folder: nil, output_folder: nil)
+          def initialize(transaction_folder: nil, output_folder: nil, debug: false)
+            @debug = debug
             # needs to use config.bank_reconciliation.transaction_folder
             transaction_folder ||= '/Volumes/Expansion/Sync/bank-reconciliation/original-transactions'
             output_folder ||= File.join(transaction_folder, 'clean')
@@ -24,16 +26,21 @@ module Appydave
           end
 
           def clean_transactions(input_globs, output_file)
+            log_info("Starting transaction cleaning with input patterns: #{input_globs}")
+
             raw_transactions = grab_raw_transactions(input_globs)
-            transactions, duplicates_count = deduplicate(raw_transactions)
+            log_info("Total raw transactions collected: #{raw_transactions.size}")
 
-            transactions = Mapper.new.map(transactions)
+            transactions, duplicates_count = deduplicate_across_files(raw_transactions)
+            log_info("Duplicates found and removed: #{duplicates_count}")
 
-            # tp transactions, Appydave::Tools::BankReconciliation::Models::Transaction.csv_headers
+            transactions = Mapper.new.map(transactions)
+            log_info('Transactions mapped to chart of accounts and bank accounts')
 
-            log.kv 'Deduped consolidated transactions', duplicates_count if duplicates_count.positive?
+            log_kv 'Deduped consolidated transactions', duplicates_count if duplicates_count.positive?
 
             save_to_csv(transactions, output_file)
+            log_kv('Transaction Output File', full_output_file(output_file))
 
             @transactions = transactions
           end
@@ -49,13 +56,13 @@ module Appydave
 
               input_globs.each do |glob|
                 Dir.glob(glob).each do |file|
-                  log.kv 'Reading transactions from', file
+                  log_kv 'Reading transactions from', file
                   raw_transactions = ReadTransactions.new(file).read
-                  deduped_transactions, duplicates_count = deduplicate(raw_transactions)
+                  deduped_transactions, duplicates_count = deduplicate_within_file(raw_transactions)
 
                   if duplicates_count.positive?
-                    log.kv 'Duplicates count', duplicates_count
-                    log.kv 'File', file
+                    log_kv 'Duplicates count within file', duplicates_count
+                    log_kv 'File', file
                   end
 
                   transactions += deduped_transactions
@@ -68,7 +75,7 @@ module Appydave
             transactions
           end
 
-          def deduplicate(transactions)
+          def deduplicate_within_file(transactions)
             unique_transactions = transactions.uniq do |transaction|
               [
                 transaction.bsb_number,
@@ -88,9 +95,41 @@ module Appydave
             [unique_transactions, duplicates]
           end
 
+          def deduplicate_across_files(transactions)
+            grouped_transactions = transactions.group_by do |transaction|
+              [
+                transaction.bsb_number,
+                transaction.account_number,
+                transaction.transaction_date,
+                transaction.narration,
+                transaction.cheque_number,
+                transaction.debit,
+                transaction.credit,
+                transaction.balance,
+                transaction.transaction_type
+              ]
+            end
+
+            unique_transactions = []
+            duplicates_count = 0
+
+            grouped_transactions.each_value do |dupes|
+              unique_transaction = dupes.first
+              unique_transaction.source_files = dupes.flat_map(&:source_files).uniq
+              duplicates_count += dupes.size - 1
+              unique_transactions << unique_transaction
+            end
+
+            [unique_transactions, duplicates_count]
+          end
+
+          def full_output_file(output_file)
+            File.join(output_folder, output_file)
+          end
+
           def save_to_csv(transactions, output_file)
             FileUtils.mkdir_p(output_folder)
-            output_file = File.join(output_folder, output_file)
+            output_file = full_output_file(output_file)
 
             CSV.open(output_file, 'w') do |csv|
               csv << Appydave::Tools::BankReconciliation::Models::Transaction.csv_headers

data/lib/appydave/tools/bank_reconciliation/clean/read_transactions.rb

@@ -44,6 +44,7 @@ module Appydave
                 balance: row['Balance'],
                 transaction_type: row['Transaction Type']
               )
+              transaction.add_source_file(@file)
               @transactions << transaction
             end
 
@@ -66,6 +67,7 @@ module Appydave
                 balance: row['Balance'],
                 transaction_type: row['Transaction Type']
               )
+              transaction.add_source_file(@file)
               @transactions << transaction
             end
 

data/lib/appydave/tools/bank_reconciliation/models/transaction.rb

@@ -18,7 +18,8 @@ module Appydave
                         :platform,
                         :coa_code,
                         :coa_match_type,
-                        :account_name
+                        :account_name,
+                        :source_files
 
           def initialize(bsb_number: nil,
                          account_number: nil,
@@ -47,41 +48,50 @@ module Appydave
             @coa_code = coa_code
             @coa_match_type = coa_match_type
             @account_name = account_name
+            @source_files = []
           end
 
+          def add_source_file(source_file)
+            @source_files << source_file.strip unless @source_files.include?(source_file.strip)
+          end
+
+          # cheque_number
+
           def self.csv_headers
             %i[
+              platform
+              account_name
               bsb_number
               account_number
               transaction_date
               narration
-              cheque_number
               debit
               credit
               balance
               transaction_type
-              platform
               coa_code
               coa_match_type
-              account_name
+              source_files
             ]
           end
 
+          # @cheque_number,
+
           def to_csv_row
             [
+              @platform,
+              @account_name,
               @bsb_number,
               @account_number,
               @transaction_date,
               @narration,
-              @cheque_number,
               @debit,
               @credit,
               @balance,
               @transaction_type,
-              @platform,
               @coa_code,
               @coa_match_type,
-              @account_name
+              @source_files
             ]
           end
         end

data/lib/appydave/tools/configuration/models/config_base.rb

@@ -15,7 +15,7 @@ module Appydave
 
           def initialize
             @config_path = File.join(Config.config_path, "#{config_name}.json")
-            puts "Config path: #{config_path}"
+            # puts "Config path: #{config_path}"
             @data = load
           end
 

data/lib/appydave/tools/debuggable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    # Debuggable is a module for adding debug logging to classes
+    module Debuggable
+      attr_accessor :debug
+
+      def log_info(message)
+        log.info(message) if debug
+      end
+
+      def log_kv(key, value)
+        log.kv(key, value) if debug
+      end
+
+      def log_subheading(message)
+        log.subheading(message) if debug
+      end
+    end
+  end
+end

data/lib/appydave/tools/prompt_tools/_doc.md

@@ -0,0 +1,5 @@
+# AI Prompt Tool
+
+Tool for running AI prompt based tasks.
+
+[ChatGPT - Update video](https://chatgpt.com/c/cf08e889-cad7-4277-918e-82f4a23b0bc8)

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.10.2'
+    VERSION = '0.10.3'
   end
 end

data/lib/appydave/tools/youtube_manager/_doc.md

@@ -2,4 +2,4 @@
 
 Service classes for interacting with the YouTube API.
 
-[ChatGPT - Update video](https://chatgpt.com/c/41b75159-95c5-4183-92f3-e1be5e52a1e8)
+[ChatGPT - Update video](https://chatgpt.com/c/41b75159-95c5-4183-92f3-e1be5e52a1e8)

data/lib/appydave/tools.rb

@@ -18,6 +18,7 @@ require 'webrick'
 require 'pry'
 
 require 'appydave/tools/version'
+require 'appydave/tools/debuggable'
 require 'appydave/tools/types/indifferent_access_hash'
 require 'appydave/tools/types/hash_type'
 require 'appydave/tools/types/array_type'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "appydave-tools",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appydave-tools",
-      "version": "0.10.2",
+      "version": "0.10.3",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.3",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "AppyDave YouTube Automation Tools",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appydave-tools
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - David Cruwys
@@ -187,10 +187,12 @@ files:
 - lib/appydave/tools/configuration/models/settings_config.rb
 - lib/appydave/tools/configuration/models/youtube_automation_config.rb
 - lib/appydave/tools/configuration/openai.rb
+- lib/appydave/tools/debuggable.rb
 - lib/appydave/tools/gpt_context/_doc.md
 - lib/appydave/tools/gpt_context/file_collector.rb
 - lib/appydave/tools/name_manager/_doc.md
 - lib/appydave/tools/name_manager/project_name.rb
+- lib/appydave/tools/prompt_tools/_doc.md
 - lib/appydave/tools/prompt_tools/models/llm_info.rb
 - lib/appydave/tools/prompt_tools/prompt_completion.rb
 - lib/appydave/tools/subtitle_master/_doc.md