neh 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c98adee45058fca1fd2d8ad4d4b986e9273d053336e380fa9cdc3e745bc2d25
-  data.tar.gz: a2a97a95699a29cde7e0374be428613d34caf49cbba52610917f3e147bf32798
+  metadata.gz: e9a34bc3bc69cf530b83888832f87d576e01223ba302feaf5e723884878a0e91
+  data.tar.gz: 3986b68fa2ff9e119b5cf5a18863d45a6ac11785c8a476fac2680ddec369e209
 SHA512:
-  metadata.gz: 02773dbfef6e5f43f48fd77d7f71587a5c3e8b811e4acbeaa47d529504257f714f5c0952e8e515bd8f90c359058fb0c4f591f54cab37ddc5f961a0bb99cafe12
-  data.tar.gz: 48f77eebdb4b7c6b94ea5a449c39db3e56465c916d37cfd7084b46386a767302c7157b9921375742603b224abd454e13fbf0978e315f67ec238321526f6af937
+  metadata.gz: 5377ead7a8e6c3f86e393152496380ec1f94d2c5f432f8946bb1e463119e8a66edad9c24b5ced9513c7c6b659bcbb3ab569e97eeb0a972ae5d0b7bdd820c9d88
+  data.tar.gz: 20506ca2fe416565e300e7d067b1e358e39c5b8bb7d65a166ce2fbab2128870b4f9ac1883547b6f1a0e950a3daba8f10e0d9a45b0fac417dfa43f7f2a19b89a4

data/lib/neh/cli/base.rb

@@ -11,7 +11,7 @@ require 'faraday'
 require 'pry' if ENV['NEH_DEBUG']
 require 'active_support/all'
 
-class Neh::Cli::Base
+class Neh::Cli::Base # rubocop:disable Metrics/ClassLength
   def initialize(*args, options:)
     @message = args.join(' ')
 
@@ -19,9 +19,11 @@ class Neh::Cli::Base
     server_host = ENV.fetch('NEH_SERVER_HOST', 'yoryo.gipcompany.com')
     server_port = ENV.fetch('NEH_SERVER_PORT', 443)
     @channel = 'LargeLanguageModelQueryChannel'
-
-    url = "ws://#{server_host}:#{server_port}/cable"
+    @uuid = SecureRandom.uuid
+    url = "ws://#{server_host}:#{server_port}/cable?uuid=#{@uuid}"
     @endpoint = Async::HTTP::Endpoint.parse(url)
+    @message_pool = {}
+    @expected_sequence_number = 1
   end
 
   def execute
@@ -56,11 +58,15 @@ class Neh::Cli::Base
   def handle_connection_message(connection, message)
     type = message[:type]
 
+    print "type: #{type}, message: #{message}" if ENV['NEH_DEBUG']
+
     case type
     when 'welcome'
       subscribe(connection)
-    when 'confirm_subscription', 'ping'
+    when 'confirm_subscription'
       on_subscribed
+    when 'ping'
+      # do nothing
     when 'disconnect'
       puts "Connection has been disconnected. Reason: #{message[:reason]}"
       close(connection)
@@ -70,12 +76,21 @@ class Neh::Cli::Base
     end
   end
 
+  def process_message_in_order
+    while @message_pool.key?(@expected_sequence_number)
+      print @message_pool.delete(@expected_sequence_number)
+      @expected_sequence_number += 1
+    end
+  end
+
   def handle_channel_message(connection, message)
     type = message[:type]
+    sequence_number = message[:sequence_number]
 
     case type
     when 'output'
-      print message[:message]
+      @message_pool[sequence_number] = message[:message]
+      process_message_in_order
     when 'worker_done'
       close(connection)
     end
@@ -90,7 +105,8 @@ class Neh::Cli::Base
       {
         command: :subscribe,
         identifier: {
-          channel: @channel
+          channel: @channel,
+          uuid: @uuid
         }.to_json
       }
     connection.write(content.to_json)
@@ -101,6 +117,7 @@ class Neh::Cli::Base
     response = http_connection.post("/api/neh/#{command}") do |req|
       req.body = {
         message: @message,
+        uuid: @uuid,
         token:
       }.to_json
 

data/lib/neh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Neh
-  VERSION = "0.0.19"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neh
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Atsushi Ishida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport