ask-web-search 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e72b7a5d69234d5b2a98512629e00c7887e690abf6cf312f02f24c092f9e464
-  data.tar.gz: 37348a846dbf38c41f41df76d52b475d6fb94e29a0c70033b70bc6ca43b743fa
+  metadata.gz: 1b83b3aa3b4e051445e316284580fa85a0d478bb5256b60c87e14031e60c6130
+  data.tar.gz: '0168f632c9d32eb42996d55f197cf2a322ad86f839b7698788c9f0cfc2e8ba87'
 SHA512:
-  metadata.gz: 489ae3316e2c88daf33cd31a478ec6a5e774fcd802a4b0c746577934af5db49fe94de9ffa12f1aa9ccde625e81129bc3d86263c9bc5ba259bf602c047153f046
-  data.tar.gz: c99af3305cc4b3417dcfc15bf5f3752d55823fd8e73baac2923431b479ac23cfdee6f3f4d81789a88d2faa9aa3216c95d2c2254dde57dea2f3b5aaaa830728a8
+  metadata.gz: 5e5cb4c7817665ca81783898ea4709e7883786f5db18778ec09a7375ef4f2abadecc77c001900a48aea277e3b18859e11a9b2c1f1cc97ecb8ded1fb6e29478f7
+  data.tar.gz: 889707ff4c5f114ffbd2340cd667de622c281374e20fdee3023280706b8bad91ad3d46b02091274779a2e1ce8ed7acbb5bcad7669cb0f616765af50d6244a282

data/lib/ask/web_search/version.rb

@@ -1,5 +1,5 @@
 module Ask
   module WebSearch
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/ask/web_search.rb

@@ -48,7 +48,9 @@ module Ask
 
     # TinyFish's hosted search endpoint — the primary backend for anyone
     # holding a (free) TINYFISH_API_KEY, so no SearXNG instance is needed.
-    TINYFISH_SEARCH_URL = "https://api.search.tinyfish.ai/client.search.query"
+    # The bare host root per the official docs curl example; the
+    # /client.search.query path seen on the marketing pages 404s.
+    TINYFISH_SEARCH_URL = "https://api.search.tinyfish.ai"
 
     # Our time_range → TinyFish's recency_minutes (SearXNG's month/year
     # are approximate engine filters anyway; these are the equivalents).
@@ -70,13 +72,25 @@ module Ask
       "research_paper" => "research_paper"
     }.freeze
 
-    # True when TinyFish should be the primary backend: a key is present
-    # and TINYFISH_SEARCH=0 has not disabled it. Read fresh on every
-    # call so tests and config reloads don't need memo resets.
+    # The TinyFish API key: ask-auth's chain when that gem is present
+    # (env override → ~/.ask/credentials.yml → …), raw ENV otherwise.
+    # nil when nothing resolves.
+    def self.tinyfish_api_key
+      return ENV["TINYFISH_API_KEY"] unless defined?(Ask::Auth)
+
+      Ask::Auth.resolve(:tinyfish_api_key)
+    rescue Ask::Auth::MissingCredential
+      nil
+    end
+
+    # True when TinyFish should be the primary backend: a key resolves
+    # (#tinyfish_api_key) and TINYFISH_SEARCH=0 has not disabled it.
+    # Read fresh on every call so tests and config reloads don't need
+    # memo resets.
     def self.use_tinyfish?
       return false if ENV["TINYFISH_SEARCH"] == "0"
 
-      !ENV["TINYFISH_API_KEY"].to_s.empty?
+      !tinyfish_api_key.to_s.empty?
     end
 
     # True when a SearXNG endpoint was configured explicitly (SEARXNG_URL
@@ -210,7 +224,7 @@ module Ask
         http.open_timeout = 5
         http.read_timeout = 10
         req = Net::HTTP::Get.new(uri)
-        req["X-API-Key"] = ENV["TINYFISH_API_KEY"]
+        req["X-API-Key"] = tinyfish_api_key
         req["User-Agent"] = "ask-web-search/#{Ask::WebSearch::VERSION}"
         res = http.request(req)
         raise Error, "TinyFish returned #{res.code}: #{res.body[0, 200]}" unless res.code.start_with?("2")
@@ -330,3 +344,15 @@ begin
 rescue LoadError => e
   raise unless e.path == "ask-tools"
 end
+
+# ask-auth is an OPTIONAL credential source for the TinyFish key: when
+# present, #tinyfish_api_key resolves through Ask::Auth (env override →
+# ~/.ask/credentials.yml → …) instead of raw ENV alone, so the key can
+# live in one canonical 0600 file instead of every config that spawns a
+# server. Only the ask-auth miss is swallowed; any other LoadError is
+# real.
+begin
+  require "ask-auth"
+rescue LoadError => e
+  raise unless e.path == "ask-auth"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-web-search
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kaka Ruto
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: ask-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement