chalk_ruby 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341f9bbb82ba439be2de0671adc74c8e901a96c3f63d3fb5a7c2e1880a983342
-  data.tar.gz: 3743783f522eb70c6cefba1158682aaae89f45049a61078eb7b72f19ebf0cc8d
+  metadata.gz: cfe57e2b3d1f09eaa9dece4b777788941b347319bca50b3242c52070287aa86f
+  data.tar.gz: '039220d201af61aff4e19fc73ea242a797b8681f87dc449e13187996eae653e6'
 SHA512:
-  metadata.gz: 76715dafed5ffcd9564c7e5fcce4a568bd77603236fffca6a4f3002d2ea1c3d0f9840840b126503341ac8d7ea19cd6152a68182574fd7cf4425869019b5ec950
-  data.tar.gz: dd0cf075a2985efa6550a948d0240dfe039920b6fe5e76d054e3f3756a339fc55e24acbbcea5f1a27ff59df4b602609411af4491fee784c1001377f710815080
+  metadata.gz: cc1d7cbfcdb2175ee61773918800270f963b136fea24573b06b97a8b22225f5488c9fed440755d964f32577822d61021122469c75c65b7e5271b19cccec03489
+  data.tar.gz: 79b8d14bbf904286f5589542dc85a0ff471b7e79ad675860893bd3e7fdaf9ceb3736a57773ed8bc78da9709a41df34dc6d4badcedad6d0c427a851dfb029aad0

data/lib/chalk_ruby/config.rb

@@ -16,6 +16,7 @@ module ChalkRuby
                   :query_timeout,
                   :api_timeout,
                   :connect_timeout,
+                  :query_service_root_ca_path,
                   :additional_headers
 
     # Creates a new ChalkRuby::Config object for use with ChalkRuby::Client.
@@ -45,18 +46,22 @@ module ChalkRuby
     # @option options [Float?] :connect_timeout
     #   The timeout for connect operations (in seconds).
     #
+    # @option options [String?] :query_service_root_ca_path
+    #   The root ca to use for trusting SSL verifying connections to the query server in grpc.
+    #
     # @option options [Hash<String, String>?] :additional_headers
     #  Additional headers to be sent with every request. Typically not required.
     #
     def initialize(opts = {})
-      @client_id          = opts[:client_id] || ENV['CHALK_CLIENT_ID']
-      @client_secret      = opts[:client_secret] || ENV['CHALK_CLIENT_SECRET']
-      @environment        = opts[:environment] || ENV['CHALK_ACTIVE_ENVIRONMENT']
-      @query_server       = opts[:query_server] || ENV['CHALK_QUERY_SERVER'] || Defaults::QUERY_SERVER
-      @api_server         = opts[:api_server] || ENV['CHALK_API_SERVER'] || Defaults::API_SERVER
-      @query_timeout      = opts[:query_timeout] || Defaults::QUERY_TIMEOUT
-      @api_timeout        = opts[:api_timeout] || Defaults::API_TIMEOUT
-      @connect_timeout    = opts[:connect_timeout] || Defaults::CONNECT_TIMEOUT
+      @client_id                        = opts[:client_id] || ENV['CHALK_CLIENT_ID']
+      @client_secret                    = opts[:client_secret] || ENV['CHALK_CLIENT_SECRET']
+      @environment                      = opts[:environment] || ENV['CHALK_ACTIVE_ENVIRONMENT']
+      @query_server                     = opts[:query_server] || ENV['CHALK_QUERY_SERVER'] || Defaults::QUERY_SERVER
+      @api_server                       = opts[:api_server] || ENV['CHALK_API_SERVER'] || Defaults::API_SERVER
+      @query_timeout                    = opts[:query_timeout] || Defaults::QUERY_TIMEOUT
+      @api_timeout                      = opts[:api_timeout] || Defaults::API_TIMEOUT
+      @connect_timeout                  = opts[:connect_timeout] || Defaults::CONNECT_TIMEOUT
+      @query_service_root_ca_path       = opts[:query_service_root_ca_path] || Defaults::ROOT_CA_PATH
       @additional_headers = opts[:additional_headers] || {}
 
       raise ChalkError, 'No Client ID provided, please set :client_id' if @client_id.nil?

data/lib/chalk_ruby/defaults.rb

@@ -32,6 +32,10 @@ module ChalkRuby
     API_TIMEOUT     = 300
     QUERY_TIMEOUT   = 1200
 
+    # GRPC
+    # ----------------------------------------
+    ROOT_CA_PATH = nil
+
     WAIT_TASK_DEFAULT_TIME_BEFORE_RETRY = 100
   end
 end

data/lib/chalk_ruby/grpc_client.rb

@@ -1,5 +1,13 @@
 require 'chalk_ruby/config'
 require 'grpc'
+require 'google/protobuf/struct_pb'
+require 'chalk_ruby/protos/chalk/server/v1/auth_pb'
+require 'chalk_ruby/protos/chalk/server/v1/auth_services_pb'
+require 'chalk_ruby/protos/chalk/engine/v1/query_server_services_pb'
+require 'date'
+require 'chalk_ruby/grpc/auth_interceptor'
+require 'chalk_ruby/error'
+
 
 module ChalkRuby
 
@@ -175,18 +183,14 @@ module ChalkRuby
     end
 
     def get_token
-      Token.new(
-        api_server_request(
-          method: :post,
-          path: '/v1/oauth/token',
-          body: {
-            client_id: @config.client_id,
-            client_secret: @config.client_secret,
-            grant_type: 'client_credentials'
-          },
-          headers: get_unauthenticated_headers
+      response = @auth_stub.get_token(
+        Chalk::Server::V1::GetTokenRequest.new(
+          client_id: @config.client_id,
+          client_secret: @config.client_secret
         )
       )
+
+      response.access_token
     end
 
     def get_unauthenticated_headers
@@ -272,7 +276,14 @@ module ChalkRuby
 
     def query_service
       if @query_service.nil?
-        @query_service = Chalk::Engine::V1::QueryService::Stub.new(query_server_host, GRPC::Core::ChannelCredentials.new(), interceptors: [engine_interceptor])
+        channel_creds =
+          if @config.query_service_root_ca_path.nil?
+            GRPC::Core::ChannelCredentials.new
+          else
+            GRPC::Core::ChannelCredentials.new(File.read(@config.query_service_root_ca_path))
+          end
+
+        @query_service = Chalk::Engine::V1::QueryService::Stub.new(query_server_host, channel_creds, interceptors: [engine_interceptor])
       end
 
       @query_service
@@ -317,21 +328,21 @@ module ChalkRuby
     def convert_to_protobuf_value(value)
       case value
       when NilClass
-        Google::Protobuf::Value.new(null_value: :NULL_VALUE)
+        ::Google::Protobuf::Value.new(null_value: :NULL_VALUE)
       when Float
-        Google::Protobuf::Value.new(number_value: value)
+        ::Google::Protobuf::Value.new(number_value: value)
       when Integer
-        Google::Protobuf::Value.new(number_value: value)
+        ::Google::Protobuf::Value.new(number_value: value)
       when String
-        Google::Protobuf::Value.new(string_value: value)
+        ::Google::Protobuf::Value.new(string_value: value)
       when TrueClass, FalseClass
-        Google::Protobuf::Value.new(bool_value: value)
+        ::Google::Protobuf::Value.new(bool_value: value)
       when Hash
         struct_value = Google::Protobuf::Struct.new(fields: value.transform_values { |v| convert_to_protobuf_value(v) })
-        Google::Protobuf::Value.new(struct_value: struct_value)
+        ::Google::Protobuf::Value.new(struct_value: struct_value)
       when Array
         list_value = Google::Protobuf::ListValue.new(values: value.map { |v| convert_to_protobuf_value(v) })
-        Google::Protobuf::Value.new(list_value: list_value)
+        ::Google::Protobuf::Value.new(list_value: list_value)
       else
         raise "Unsupported type: #{value.class}"
       end

data/lib/chalk_ruby/http/http_requester_chalk.rb

@@ -2,6 +2,7 @@ require 'faraday'
 # Default adapter needs to be required to be registered
 require 'faraday/net_http_persistent' unless Faraday::VERSION < '1'
 require 'chalk_ruby/error'
+require 'chalk_ruby/helpers'
 
 module ChalkRuby
   module Http

data/lib/chalk_ruby/version.rb

@@ -1,3 +1,3 @@
 module ChalkRuby
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.4'.freeze
 end

data/test/chalk_ruby/integration/client_test.rb

@@ -3,6 +3,7 @@ require 'rspec/autorun'
 require 'chalk_ruby/client'
 require 'chalk_ruby/error'
 
+
 CLIENT_ID     = ''
 CLIENT_SECRET = ''
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chalk_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chalk AI, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler