neh 0.0.23 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b439f5f249bf9904c1120635eef65b477a8ad769c1f52c7a47b95d48fc6ffc
-  data.tar.gz: a873810f8083889464e4de53f6f28468e3fa1a589b187542d435eea37f4639ab
+  metadata.gz: 550819e91c6cd6dc8c57c7fa1cff4698652e77333a7bac1379697ebef5a7b314
+  data.tar.gz: 25526b39861ddd276647f446aacea145743757a254613d0245236a79237c157a
 SHA512:
-  metadata.gz: 1863c446c1cddcac3fac7f3bbdd8fd27b392d7c14014daf02639837dad6061058d05d23a4938e432a83007d8c01cc200a554b46635c147e0cac9aa500cd8dbf1
-  data.tar.gz: 14411df40b0463fe1851364e8157777281164e6b9d1112f1835929f6769f1b86c33d05e50c281509d4c45089281785e03a6eebba54a51a2518b6631c21dd2f8c
+  metadata.gz: 670d5fa4c6d5188462e66ec1de7f7d9449d1f568762c0da7618b3f37603520d7386c0b4998991ff8237690e59e836c26262d5d76ec41158662b3714e61dcd781
+  data.tar.gz: 6b00589c49832231863c3e2282b9a5e45cd89c24889c11a13dbb6a04c7eb5e4bd1b9ce7157bd682041d03dbe0776eb7edb35d6c2c3b9319050a0a4674cdc3cd7

data/lib/neh/cli/base.rb

@@ -11,22 +11,18 @@ require 'pry' if ENV['NEH_DEBUG']
 require 'active_support/all'
 
 class Neh::Cli::Base # rubocop:disable Metrics/ClassLength
+  attr_reader :uuid
+
   def initialize(*args, options:)
     @message = args.join(' ')
-
     @options = options
-    server_host = ENV.fetch('NEH_SERVER_HOST', 'yoryo.gipcompany.com')
-    server_port = ENV.fetch('NEH_SERVER_PORT', 443)
-    @channel = 'LargeLanguageModelQueryChannel'
-    @uuid = SecureRandom.uuid
-    url = "ws://#{server_host}:#{server_port}/cable?uuid=#{@uuid}"
-    @endpoint = Async::HTTP::Endpoint.parse(url)
     @message_pool = {}
     @expected_sequence_number = 1
+    @uuid = SecureRandom.uuid
   end
 
   def execute
-    Async::WebSocket::Client.connect(@endpoint, headers: { 'Authorization' => "Bearer #{token}" }) do |connection|
+    Async::WebSocket::Client.connect(endpoint, headers: { 'Authorization' => "Bearer #{token}" }) do |connection|
       while (message = connection.read)
         parsed_message =
           JSON.parse(message, symbolize_names: true)
@@ -106,19 +102,23 @@ class Neh::Cli::Base # rubocop:disable Metrics/ClassLength
       {
         command: :subscribe,
         identifier: {
-          channel: @channel,
-          uuid: @uuid
+          channel:,
+          uuid:
         }.to_json
       }
     connection.write(content.to_json)
     connection.flush
   end
 
+  def channel
+    'LargeLanguageModelQueryChannel'
+  end
+
   def on_subscribed
     response = http_connection.post("/api/neh/#{command}") do |req|
       req.body = {
         message: @message,
-        uuid: @uuid,
+        uuid:,
         token:
       }.to_json
 
@@ -141,13 +141,20 @@ class Neh::Cli::Base # rubocop:disable Metrics/ClassLength
   end
 
   def http_connection
-    Faraday.new(url: "#{protocol}://#{@endpoint.hostname}:#{@endpoint.port}") do |faraday|
+    Faraday.new(url:) do |faraday|
       faraday.adapter Faraday.default_adapter
       faraday.headers['Authorization'] = "Bearer #{token}"
     end
   end
 
-  def protocol
-    @endpoint.secure? ? 'https' : 'http'
+  def endpoint
+    Async::HTTP::Endpoint.parse(
+      url,
+      alpn_protocols: Async::HTTP::Protocol::HTTP11.names #=> ["http/1.1"]
+    )
+  end
+
+  def url
+    ENV['WORKING_ON_LOCALHOST'].present? ? "http://localhost:6060/cable?uuid=#{uuid}" : "https://yoryo-app.onrender.com/cable?uuid=#{uuid}"
   end
 end

data/lib/neh/cli/o.rb

@@ -1,12 +1,149 @@
 # frozen_string_literal: true
 
-module Neh::Cli
-  class O < Base
-    private
+require 'securerandom'
+require 'net/http'
+require 'async'
+require 'async/io/stream'
+require 'async/http/endpoint'
+require 'async/websocket/client'
+require 'faraday'
+require 'pry'
+require 'active_support/all'
 
-    def close(connection)
-      puts ''
-      super
+class Neh::Cli::O # rubocop:disable Metrics/ClassLength
+  attr_reader :uuid
+
+  def initialize(*args, options:)
+    @message = args.join(' ')
+    @options = options
+    @message_pool = {}
+    @expected_sequence_number = 1
+    @uuid = SecureRandom.uuid
+  end
+
+  def execute
+    Async::WebSocket::Client.connect(endpoint, headers: { 'Authorization' => "Bearer #{token}" }) do |connection|
+      while (message = connection.read)
+        parsed_message =
+          JSON.parse(message, symbolize_names: true)
+
+        on_receive(connection, parsed_message)
+      end
     end
   end
+
+  private
+
+  def token
+    neh_personal_access_token = ENV.fetch('NEH_PERSONAL_ACCESS_TOKEN', nil)
+
+    puts 'Please set the environment variable NEH_PERSONAL_ACCESS_TOKEN.' if neh_personal_access_token.blank?
+
+    neh_personal_access_token
+  end
+
+  def on_receive(connection, body)
+    if body[:type]
+      handle_action_cable_messages(connection, body)
+    else
+      handle_broadcasted_messages(connection, body[:message])
+    end
+  end
+
+  def handle_action_cable_messages(connection, message)
+    type = message[:type]
+
+    case type
+    when 'welcome'
+      subscribe(connection)
+    when 'confirm_subscription'
+      on_subscribed
+    when 'ping'
+      # do nothing
+    when 'disconnect'
+      puts "Connection has been disconnected. Reason: #{message[:reason]}"
+      close(connection)
+    else
+      puts "Unknown message type: #{type}. Closing connection."
+      close(connection)
+    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_broadcasted_messages(connection, message)
+    type = message[:type]
+    body = message[:body]
+
+    case type
+    when 'output'
+      sequence_number = message[:sequence_number]
+      @message_pool[sequence_number] = body
+      process_message_in_order
+    when 'error'
+      print body
+    when 'worker_done'
+      close(connection)
+    end
+  end
+
+  def close(connection)
+    connection.close
+  end
+
+  def subscribe(connection)
+    content =
+      {
+        command: :subscribe,
+        identifier: {
+          channel: 'LargeLanguageModelQueryChannel',
+          uuid:
+        }.to_json
+      }
+    connection.write(content.to_json)
+    connection.flush
+  end
+
+  def on_subscribed
+    response = http_connection.post("/api/neh/o") do |req|
+      req.body = {
+        message: @message,
+        uuid:,
+        token:
+      }.to_json
+
+      req.headers['Content-Type'] = 'application/json'
+    end
+
+    body = JSON.parse response.body
+    message = body['message']
+    puts message if message.present?
+  end
+
+  def http_connection
+    Faraday.new(url: http_url) do |faraday|
+      faraday.adapter Faraday.default_adapter
+      faraday.headers['Authorization'] = "Bearer #{token}"
+    end
+  end
+
+  def endpoint
+    Async::HTTP::Endpoint.parse(
+      ws_url,
+      alpn_protocols: Async::HTTP::Protocol::HTTP11.names #=> ["http/1.1"]
+    )
+  end
+
+  def http_url
+    ENV['WORKING_ON_LOCALHOST'].present? ? "http://localhost:6060/cable?uuid=#{uuid}" : "https://yoryo-app.onrender.com/cable?uuid=#{uuid}"
+  end
+
+  def ws_url
+    ENV['WORKING_ON_LOCALHOST'].present? ? "ws://localhost:6060/cable?uuid=#{uuid}" : "wss://yoryo-app.onrender.com/cable?uuid=#{uuid}" # rubocop:disable Metrics/LineLength
+  end
 end

data/lib/neh/version.rb

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

metadata

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