kanal-interfaces-pachka 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da3ea2ca5eb705a798c4f661e30128b9b7acfd219a81e2b59c7b16fd140c68b5
-  data.tar.gz: d9625a3ec90ddea49fe88a5c65e2d6eae44e4ae0671e8c070d752ece652154de
+  metadata.gz: ef104bb341ba6f3678ba148f790a89ab2c280c3f449c6d428a21f47ebd527854
+  data.tar.gz: b187b939765f3f51dbaba85354412a71a7760a6984ebc0d2b452e755f55777bd
 SHA512:
-  metadata.gz: 8506860e02a1077d7b5ac2d2805c2ced396df3d745e9f5b2ef9527366c017d5384e2443eed20b1c2f4f060ce291a067c14f09d8e588ebdf1394c865988cc1b0f
-  data.tar.gz: 2116b6b5469bd94488484ba220c891e732d6391b296a720bf675df221b780ecef0e1a8365b6987a800e254a075b6792e7f283ef13b3397f1aa904335785797a3
+  metadata.gz: a76f6bd5236bc98e2c334b7d60e3251246cb8066bb11f4f91dbadce6b5c7497e8993d9cfb76ba9e18f804ee70e0ba6c9212321e5c558c5874a7773ce0e47f762
+  data.tar.gz: 9e79580d073bd983da530f8a7a71ce8c51dbb917172d2cb308b6aa361ba10d3209c718c3db2d93eceac4efeac75e8dd2ed82b16bbb848ced4a4f4d83afa8e18e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kanal-interfaces-pachka (0.1.1)
+    kanal-interfaces-pachka (0.1.2)
       faraday (= 2.7.4)
       faraday-multipart (= 1.0.4)
       kanal (= 0.5.1)

data/example/example.rb

@@ -9,11 +9,11 @@ logger = Logger.new $stdout
 logger.level = Logger::WARN
 core.add_logger logger
 
-api_key = ENV.fetch("PACHKA_API_KEY", nil)
+api_key = ENV.fetch("PACHKA_ACCESS_TOKEN", nil)
 
 puts "Pachka api key: #{api_key}"
 
-interface = Kanal::Interfaces::Pachka::PachkaInterface.new(core, api_key, api_debug_log: false)
+interface = Kanal::Interfaces::Pachka::PachkaInterface.new(core, api_key, local_server_log: true, api_debug_log: true)
 
 interface.router.default_response do
   pachka_text "Hey! I don't know how to answer to this yet... But I will, someday ;)"

data/lib/kanal/interfaces/pachka/helpers/pachka_api.rb

@@ -16,6 +16,8 @@ module Kanal
         class PachkaApi
           include Kanal::Logger
 
+          UploadedFile = Struct.new(:file_key, :file_name, :file_type, :file_size)
+
           #
           # @param access_token [String] access token for bot
           # @param verbose [Boolean] pass true to enable STDOUT logging of requests and responses
@@ -39,40 +41,57 @@ module Kanal
 
           #
           # Method sends text message via bot into the Pachka api
+          # with optionally sending files
           #
           # @param entity_id [Integer] id of discussion obtained from input
+          # @param entity_type [String] type of chat obtained from input
           # @param text [String] text to be sent
+          # @param uploaded_files [Array] array of UploadedFile objects to send with message
           #
           # @return [void] <description>
           #
-          def send_text(entity_id, text)
+          def send_message(entity_id, entity_type, text, uploaded_files = [])
+            payload = {
+              message: {
+                entity_type: entity_type,
+                entity_id: entity_id,
+                content: text
+              }
+            }
+
+            unless uploaded_files.empty?
+              files = []
+
+              uploaded_files.each do |uploaded_file|
+                files << {
+                  key: uploaded_file.file_key,
+                  name: uploaded_file.file_name,
+                  file_type: uploaded_file.file_type,
+                  size: uploaded_file.file_size
+                }
+              end
+
+              payload[:message][:files] = files
+            end
+
             @conn.post(
               "messages",
-              {
-                message: {
-                  entity_type: "discussion",
-                  entity_id: entity_id,
-                  content: text
-                }
-              }.to_json,
+              payload.to_json,
               { "Content-Type" => "application/json" }
             )
           rescue Exception => e
             logger.error "Cant send message to Pachka api! Error: #{e.full_message}"
+            raise
           end
 
           #
-          # Method sends message with file
+          # Method uploads file at filepath to Pachka api and returns UploadedFile
           #
-          # @param entity_id [Integer] entity_id obtained via input.pachka_entity_id
           # @param filepath [String] local filepath to file
-          # @param text [String] text of message
           #
-          # @return [void] <description>
+          # @return [UploadedFile] object containing all needed info to send with message
           #
-          def send_file(entity_id, filepath, text)
-            text ||= " "
-
+          def upload_file(filepath)
             # Obtaining all the needed fields for uploading a file
             res = @conn.post("uploads")
 
@@ -107,25 +126,12 @@ module Kanal
 
             raise "Problem with uploading file to Pachka api! More in api logs." unless res.success?
 
-            res = @conn.post(
-              "messages",
-              {
-                message: {
-                  entity_type: "discussion",
-                  entity_id: entity_id,
-                  content: text,
-                  files: [
-                    key: file_key,
-                    name: filename,
-                    file_type: mime_type.include?("image") ? "image" : "file",
-                    size: File.size(filepath)
-                  ]
-                }
-              }.to_json,
-              { "Content-Type" => "application/json" }
+            UploadedFile.new(
+              file_key,
+              filename,
+              mime_type.include?("image") ? "image" : "file",
+              File.size(filepath)
             )
-
-            raise "Problem with sending message with file to Pachka api! More in api logs." unless res.success?
           rescue Exception => e
             logger.error "Error sending file to Pachka api! More info: #{e.full_message}"
           end

data/lib/kanal/interfaces/pachka/pachka_interface.rb

@@ -36,13 +36,13 @@ module Kanal
         # @param local_server_debug_log [Boolean] pass true for local server to log requests to it to Kanal logger
         # @param api_debug_log [Boolean] pass true to log pachka api requests to STDOUT
         #
-        def initialize(core, access_token, host: "localhost", port: 8090, local_server_debug_log: false, api_debug_log: false)
+        def initialize(core, access_token, host: "localhost", port: 8090, local_server_log: false, api_debug_log: false)
           super(core)
 
           @port = port
           @host = host
 
-          @local_server_debug_log = local_server_debug_log
+          @local_server_log = local_server_log
 
           @api = Kanal::Interfaces::Pachka::Helpers::PachkaApi.new access_token, verbose: api_debug_log
 
@@ -53,12 +53,37 @@ module Kanal
         end
 
         def consume_output(output)
+          text = output.pachka_text
+
+          uploaded_files = []
+
           unless output.pachka_file_path.nil?
-            @api.send_file(output.pachka_entity_id, output.pachka_file_path, output.pachka_text)
-            return
+            uploaded_file = @api.upload_file output.pachka_file_path
+
+            uploaded_files << uploaded_file
           end
 
-          @api.send_text(output.pachka_entity_id, output.pachka_text) unless output.pachka_text.nil?
+          # When sending files without text
+          text ||= " "
+
+          @api.send_message(
+            output.pachka_entity_id,
+            output.pachka_entity_type,
+            text,
+            uploaded_files
+          )
+        rescue Exception => e
+          logger.error "Error sending output as message to Pachka api! More info: #{e.full_message}"
+
+          begin
+            @api.send_message(
+              output.pachka_entity_id,
+              output.pachka_entity_type,
+              "Error occured while sending message to Pachka api. Please consult with developers of this bot"
+            )
+          rescue Exception => e
+            logger.fatal "Can't even send message about erro to Pachka api! More info: #{e.full_message}"
+          end
         end
 
         def start
@@ -66,10 +91,11 @@ module Kanal
 
           endpoint = Kanal::Interfaces::Pachka::Helpers::LocalServer.new(@host, @port)
           endpoint.on_request do |body|
-            logger.debug "Local server received request with body: #{body}" if @local_server_debug_log
+            logger.debug "Local server received request with body: #{body}" if @local_server_log
 
             input = core.create_input
             input.source = :pachka
+            input.pachka_entity_type = body["entity_type"]
             input.pachka_entity_id = body["entity_id"]
             input.pachka_query = body["content"]
 

data/lib/kanal/interfaces/pachka/plugins/pachka_integration_plugin.rb

@@ -30,12 +30,14 @@ module Kanal
 
           def register_input_parameters(core)
             core.register_input_parameter :pachka_query, readonly: true
+            core.register_input_parameter :pachka_entity_type, readonly: true
             core.register_input_parameter :pachka_entity_id, readonly: true
             core.register_input_parameter :pachka_command, readonly: true
             core.register_input_parameter :pachka_text, readonly: true
           end
 
           def register_output_parameters(core)
+            core.register_output_parameter :pachka_entity_type
             core.register_output_parameter :pachka_entity_id
             core.register_output_parameter :pachka_text
             core.register_output_parameter :pachka_file_path
@@ -52,7 +54,8 @@ module Kanal
             end
 
             core.hooks.attach :output_before_returned do |input, output|
-              output.pachka_entity_id = input.pachka_entity_id
+              output.pachka_entity_id = input.pachka_entity_id if output.pachka_entity_id.nil?
+              output.pachka_entity_type = input.pachka_entity_type if output.pachka_entity_type.nil?
             end
           end
 

data/lib/kanal/interfaces/pachka/version.rb

@@ -3,7 +3,7 @@
 module Kanal
   module Interfaces
     module Pachka
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanal-interfaces-pachka
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - idchlife
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-15 00:00:00.000000000 Z
+date: 2023-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday