neh 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93c44325fa63190f3f4ea3ac1360e5f79ba873f7631aa6123ca77db7bfd54e1e
-  data.tar.gz: 94eadfd75816415b851bbb86571d262b6b86c476662efcc4f207138f8d9066d7
+  metadata.gz: 0c3f44261ded942a8b71b5220b9090665c7bab7a421cad3679021b0532659bec
+  data.tar.gz: 5933563a6faface0525a0e09db270fc110a5701124e31f64fed68d21c293d27c
 SHA512:
-  metadata.gz: 6224764c0498bbe90b39f3a13feb71c77a42e0a2103e57e647335c7ae5f07049155734ceb854b8b7b584bf37a916311005bffef5e7397ffcde9b1311dcafd8c7
-  data.tar.gz: 7b093d1222b7ccf38cc29904b38c69357c3c7a7caad51ea5a44ec866079f008b48d2186175158b4161e0c79c3db2768973b10158f833c24262c036f0fe29083f
+  metadata.gz: c937fce4a966a8862dfa7a49a6559384d0ec2d4cc310d3953a37930b70e61cc2cd950945282600980b79c6f548e388650c5bbb0d44f85c4494963e33d5f55412
+  data.tar.gz: f916960510c1afee4da69f1769e80d5f3fcf564dbe327cc25f4380df9c1f24b281ca4a908c12da602696358bd44883dad74b5b9c5911c7933836a2d967df823f

data/lib/neh/cli/base.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+require 'net/http'
+require 'async'
+require 'async/io/stream'
+require 'async/http/endpoint'
+require 'async/websocket/client'
+require 'ruby-progressbar'
+require 'faraday'
+require 'pry'
+require 'active_support/all'
+
+class Neh::Cli::Base
+  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'
+
+    url = "ws://#{server_host}:#{server_port}/cable"
+    @endpoint = Async::HTTP::Endpoint.parse(url)
+  end
+
+  def execute
+    Async do |_task|
+      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
+  end
+
+  private
+
+  def token
+    ENV.fetch('NEH_PERSONAL_ACCESS_TOKEN')
+  end
+
+  def on_receive(connection, message)
+    if message[:type]
+      handle_connection_message(connection, message)
+    else
+      handle_channel_message(connection, message[:message])
+    end
+  end
+
+  def handle_connection_message(connection, message)
+    type = message[:type]
+
+    case type
+    when 'welcome'
+      subscribe(connection)
+    when 'confirm_subscription'
+      on_subscribed
+    end
+  end
+
+  def handle_channel_message(connection, message)
+    type = message[:type]
+
+    case type
+    when 'output'
+      print message[:message]
+    when 'worker_done'
+      close(connection)
+    end
+  end
+
+  def close(connection)
+    connection.close
+  end
+
+  def subscribe(connection)
+    content =
+      {
+        command: :subscribe,
+        identifier: {
+          channel: @channel
+        }.to_json
+      }
+    connection.write(content.to_json)
+    connection.flush
+  end
+
+  def on_subscribed
+    response = http_connection.post("/api/neh/#{command}") do |req|
+      req.body = {
+        message: @message,
+        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 command
+    raise NotImplementedError if instance_of?(Neh::Cli::Base)
+
+    unless self.class.ancestors.include?(Neh::Cli::Base)
+      raise NotImplementedError, 'command method must be implemented in subclasses'
+    end
+
+    self.class.name.demodulize.downcase
+  end
+
+  def http_connection
+    Faraday.new(url: "#{protocol}://#{@endpoint.hostname}:#{@endpoint.port}") do |faraday|
+      faraday.adapter Faraday.default_adapter
+      faraday.headers['Authorization'] = "Bearer #{token}"
+    end
+  end
+
+  def protocol
+    @endpoint.secure? ? 'https' : 'http'
+  end
+end

data/lib/neh/cli/decache.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Neh::Cli
+  class Decache < Base
+  end
+end

data/lib/neh/cli/o.rb

@@ -1,116 +1,12 @@
 # frozen_string_literal: true
 
-require 'securerandom'
-require 'net/http'
-require 'async'
-require 'async/io/stream'
-require 'async/http/endpoint'
-require 'async/websocket/client'
-require 'ruby-progressbar'
-require 'faraday'
-require 'pry'
+module Neh::Cli
+  class O < Base
+    private
 
-class Neh::Cli::O
-  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'
-
-    url = "ws://#{server_host}:#{server_port}/cable"
-    @endpoint = Async::HTTP::Endpoint.parse(url)
-  end
-
-  def execute
-    Async do |_task|
-      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
-  end
-
-  private
-
-  def token
-    ENV.fetch('NEH_PERSONAL_ACCESS_TOKEN')
-  end
-
-  def on_receive(connection, message)
-    if message[:type]
-      handle_connection_message(connection, message)
-    else
-      handle_channel_message(connection, message[:message])
-    end
-  end
-
-  def handle_connection_message(connection, message)
-    type = message[:type]
-
-    case type
-    when 'welcome'
-      subscribe(connection)
-    when 'confirm_subscription'
-      on_subscribed
-    end
-  end
-
-  def handle_channel_message(connection, message)
-    type = message[:type]
-
-    case type
-    when 'output'
-      print message[:message]
-    when 'worker_done'
+    def close(connection)
       puts ''
-      connection.close
-    end
-  end
-
-  def subscribe(connection)
-    content =
-      {
-        command: :subscribe,
-        identifier: {
-          channel: @channel
-        }.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,
-        token:
-      }.to_json
-
-      req.headers['Content-Type'] = 'application/json'
+      super
     end
-
-    body = JSON.parse response.body
-    puts body['message'] if debug_mode?
-  end
-
-  def http_connection
-    Faraday.new(url: "#{protocol}://#{@endpoint.hostname}:#{@endpoint.port}") do |faraday|
-      faraday.adapter Faraday.default_adapter
-      faraday.headers['Authorization'] = "Bearer #{token}"
-    end
-  end
-
-  def protocol
-    @endpoint.secure? ? 'https' : 'http'
-  end
-
-  def debug_mode?
-    ENV['NEH_DEBUG'] == 'true'
   end
 end

data/lib/neh/cli.rb

@@ -5,4 +5,6 @@ require 'neh'
 module Neh::Cli
 end
 
+require_relative 'cli/base'
 require_relative 'cli/o'
+require_relative 'cli/decache'

data/lib/neh/thor.rb

@@ -14,6 +14,11 @@ class Neh::Thor < Thor
     Neh::Cli::Version.new.execute
   end
 
+  desc 'decache', 'Deletes the session cache with the LLM AI so far.'
+  def decache(*)
+    Neh::Cli::Decache.new(*, options:).execute
+  end
+
   desc 'o', 'This is the most standard command you can use to query an LLM AI.'
   def o(*)
     Neh::Cli::O.new(*, options:).execute

data/lib/neh/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: neh
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Atsushi Ishida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +98,8 @@ files:
 - exe/neh
 - lib/neh.rb
 - lib/neh/cli.rb
+- lib/neh/cli/base.rb
+- lib/neh/cli/decache.rb
 - lib/neh/cli/o.rb
 - lib/neh/cli/version.rb
 - lib/neh/thor.rb