async-ollama 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3be9b447500c19efa6291703fffde4f69bf15843835ee407b245f32c3afb2d8
-  data.tar.gz: 58021a3c814a34f5e7a905d4fc39af14aa662bdd2fb826e8c02dd62e4ff5639d
+  metadata.gz: b056f00255624f62489fbe6c06a2f2c9a5ec520293b647d0420cff3624b65249
+  data.tar.gz: d3e1ab3b0e78a4c5886e039cc5f81c9e25a89a56f91125e169c9e3c9009187aa
 SHA512:
-  metadata.gz: c0d8201a8e2e1692d78453addd780c662f7ac9e0e0303a27618e855850a04da9d65808bfc21b69f2d8dc9a6d79293eb6cdc01ef3ccfc32939290956c9e350a18
-  data.tar.gz: '08a238788cdcc33a79a26b9f2eaffe842392c8f9d68730b6f3b6edcd18c9c5c3e10455fcb8c6906d173510e1f97683c653501c8237233b4eba3950fd4e207d54'
+  metadata.gz: 8f7fde1e4f5a3a8a6b5d7b39c494a58a97287fff397d909e3d87b2e77b6ef29f1f9a407ca20adfb480757cf08545360161e73fa86fd932b9cf62fdfd07c049ca
+  data.tar.gz: '06974289477bb32e452b89c4ccdcb9122de141216c422c3139ec7402c31cbdd9c5d63aff6ba4d915bff81494dc56e984bc910cc1cb745890d8e8e0b51be6b08f'

data/lib/async/ollama/client.rb

@@ -12,7 +12,7 @@ require_relative "pull"
 
 module Async
 	module Ollama
-		MODEL = ENV.fetch("ASYNC_OLLAMA_MODEL", "llama3.1:latest")
+		MODEL = ENV.fetch("ASYNC_OLLAMA_MODEL", "llama3.2:latest")
 		
 		# Represents a connection to the Ollama service, providing methods to generate completions, chat, and list models.
 		class Client < Async::REST::Resource

data/lib/async/ollama/transform.rb

@@ -23,8 +23,9 @@ module Async
 			SYSTEM_PROMPT = <<~PROMPT
 				You are a precise file transformation tool.
 				When given a file and instructions, you output ONLY the transformed file content.
-				Do not add any explanation, preamble, summary of changes, or markdown code fences.
-				Output the raw file content exactly as it should be written to disk.
+				Do not add any explanation, preamble, summary of changes.
+				Output the raw file content exactly as it should be executed.
+				Do not include markdown code fences in your output.
 				Preserve all existing content unless the instructions explicitly require removal.
 				If a reference template is provided, use it as a structural guide for what to add or how to format new content — do not copy it verbatim or replace existing content with it.
 			PROMPT
@@ -40,16 +41,16 @@ module Async
 			# @parameter instruction [String] What change to make.
 			# @parameter template [String | nil] An optional reference example showing the desired structure.
 			# @returns [String] The transformed file content.
-			def call(content, instruction:, template: nil)
+			def call(content, instruction:, template: nil, model: @model)
 				messages = [
 					{role: "system", content: SYSTEM_PROMPT},
 					{role: "user", content: build_prompt(content, instruction, template)}
 				]
 				
 				Client.open do |client|
-					reply = client.chat(messages, model: @model)
+					reply = client.chat(messages, model: model)
 					
-					reply.response
+					return strip_fences(reply.response)
 				end
 			end
 			
@@ -64,6 +65,18 @@ module Async
 			
 			private
 			
+			def strip_fences(content)
+				content = content.strip
+				
+				# Models frequently wrap output in code fences despite being instructed not to:
+				if match = content.match(/\A```\w*\n(.*\n)```\z/m)
+					Console.warn(self, "Stripping markdown code fences from model output.")
+					content = match[1]
+				end
+				
+				return content
+			end
+			
 			def build_prompt(content, instruction, template = nil)
 				parts = []
 				parts << "## Current file\n\n```\n#{content}\n```"

data/lib/async/ollama/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Ollama
-		VERSION = "0.9.0"
+		VERSION = "0.10.0"
 	end
 end

data/readme.md

@@ -14,6 +14,12 @@ Please see the [project documentation](https://socketry.github.io/async-ollama/)
 
 Please see the [project releases](https://socketry.github.io/async-ollama/releases/index) for all releases.
 
+### v0.10.0
+
+  - Update default model to `llama3.2`.
+  - Allow model selection for `Async::Ollama::Transform.call(model: "...")`.
+  - Introduce code fence stripping for better handling of code blocks in transformations.
+
 ### v0.9.0
 
   - Add `Async::Ollama::Transform` for intelligent code transformations using Ollama models. This can be used to implement features like automatic code updates based on instructions, while preserving user modifications and existing content.

data/releases.md

@@ -1,5 +1,11 @@
 # Releases
 
+## v0.10.0
+
+  - Update default model to `llama3.2`.
+  - Allow model selection for `Async::Ollama::Transform.call(model: "...")`.
+  - Introduce code fence stripping for better handling of code blocks in transformations.
+
 ## v0.9.0
 
   - Add `Async::Ollama::Transform` for intelligent code transformations using Ollama models. This can be used to implement features like automatic code updates based on instructions, while preserving user modifications and existing content.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-ollama
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams