Protect from more ollama responses (#142)

* update version to 1.20.2 * protect from ollama responses with nested hashes --------- Co-authored-by: nick <nicholas.newberry@oxaro.com>
nickthecook · Nov 19, 2024 · cbc7088 · cbc7088
1 parent 22d3e21
commit cbc7088
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -147,3 +147,5 @@ RSpec/InstanceVariable:
 Rails/I18nLocaleTexts:
   # reenable when we localize
   Enabled: false
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
diff --git a/app/services/ollama_proxy/formatted_chat_response.rb b/app/services/ollama_proxy/formatted_chat_response.rb
@@ -35,11 +35,14 @@ def generate(&)
     def extract_content(chunk)
       response_hash = parse_chunk(chunk)
 
-      response_hash.dig("message", "content") ||
+      content = response_hash.dig("message", "content") ||
         response_hash.dig("choices", 0, "delta", "content") ||
         response_hash.dig("choices", 0, "message", "content") ||
         response_hash["error"] ||
         chunk
+      content = content.to_s unless content.is_a?(String)
+
+      content
     end
 
     def parse_chunk(chunk)

diff --git a/config/initializers/version.rb b/config/initializers/version.rb
@@ -2,5 +2,5 @@
   `git describe --tags`.strip
 else
   # make this calculated in production, or at least have tests or something else to detect drift from git tag
-  "v1.20.0"
+  "v1.20.2"
 end