Changes to make Ollama work in Gemstone [feenkcom/gtoolkit#4322]

rowan/components/Core.ston

@@ -11,4 +11,4 @@ RwSimpleProjectLoadComponentV2 {
 		'Gt4Ollama'
 	],
 	#comment : ''
-}
+}

rowan/components/gemstone/Core.ston

@@ -7,4 +7,4 @@ RwPlatformNestedProjectLoadComponentV2 {
 		'Gt4Llm-Gemstone'
 	],
 	#comment : ''
-}
+}

rowan/project.ston

@@ -8,4 +8,4 @@ RwProjectSpecificationV2 {
 	#packageFormat : 'tonel',
 	#packageConvention : 'RowanHybrid',
 	#comment : ''
-}
+}

src/Gt4Llm-Gemstone/ExecBlock.extension.st

@@ -0,0 +1,7 @@
+Extension { #name : 'ExecBlock' }
+
+{ #category : '*Gt4Llm-Gemstone' }
+ExecBlock >> doWhileTrue: aBlock [
+	self value.
+	^ aBlock whileTrue: self
+]

src/Gt4Llm/GtLlmEntity.class.st

@@ -1,14 +1,14 @@
 Class {
-	#name : #GtLlmEntity,
-	#superclass : #Object,
+	#name : 'GtLlmEntity',
+	#superclass : 'Object',
 	#instVars : [
 		'rawData',
 		'client'
 	],
-	#category : #Gt4Llm
+	#category : 'Gt4Llm'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity class >> from: aDictionary [
 	| entity |
 	(aDictionary isKindOf: self) ifTrue: [ ^ aDictionary ].
@@ -20,29 +20,29 @@ GtLlmEntity class >> from: aDictionary [
 	^ entity
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity class >> serializationProperties [
 	^ #()
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity >> client [
 	^ client
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity >> client: anObject [
 	client := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtLlmEntity >> deserializeTime: anObject [
 	^ (anObject isNil or: [ anObject isKindOf: DateAndTime ])
 		ifTrue: [ anObject ]
 		ifFalse: [ DateAndTime fromUnixTime: anObject ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtLlmEntity >> from: aDictionary [
 	self rawData: aDictionary.
 
@@ -53,7 +53,7 @@ GtLlmEntity >> from: aDictionary [
 				withArguments: {aDictionary at: aPair key ifAbsent: [ nil ]} ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity >> gtViewRawDataFor: aView [
 	<gtView>
 	self rawData ifNil: [^ aView empty ].
@@ -65,7 +65,7 @@ GtLlmEntity >> gtViewRawDataFor: aView [
 		view: #gtItemsFor:
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtLlmEntity >> merge: anotherEntity [
 	self rawData: anotherEntity rawData.
 
@@ -77,19 +77,19 @@ GtLlmEntity >> merge: anotherEntity [
 				ifNotNil: [ self perform: (aPair value , ':') asSymbol withArguments: {aValue} ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity >> rawData [
 	^ rawData
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity >> rawData: anObject [
 	rawData := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtLlmEntity >> serialize [
 	^ (self class serializationProperties
 		collect: [ :aPair | aPair key -> (self perform: aPair value) ]) asDictionary
-		reject: #isNil
+		reject: [ :aValue | aValue isNil ]
 ]

src/Gt4Ollama/GtOllamaCompleteChatAPIClient.class.st

@@ -1,75 +1,76 @@
 Class {
-	#name : #GtOllamaCompleteChatAPIClient,
-	#superclass : #GtLlmEndpointClient,
+	#name : 'GtOllamaCompleteChatAPIClient',
+	#superclass : 'GtLlmEndpointClient',
 	#instVars : [
 		'messages',
 		'model',
 		'format',
 		'tools'
 	],
-	#category : #Gt4Ollama
+	#category : 'Gt4Ollama'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> entity [
 	| entity |
-	entity := {'stream' -> false.
-			'model' -> self model.
-			'messages' -> (self messages collect: #serialize)} asDictionary.
+	entity := {('stream' -> false).
+	('model' -> self model).
+	('messages' -> (self messages collect: [ :aMessage | aMessage serialize ]))}
+		asDictionary.
 
 	self format ifNotNil: [ entity at: 'format' put: self format ].
 	self tools
-		ifNotNil: [ entity at: 'tools' put: (self tools collect: #serialize) ].
+		ifNotNil: [ entity at: 'tools' put: (self tools collect: #'serialize') ].
 
 	^ entity
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> format [
 	^ format
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> format: anObject [
 	format := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> messages [
 	^ messages
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> messages: anObject [
 	messages := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> model [
 	^ model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> model: anObject [
 	model := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> request [
 	^ self client post: '/chat' withEntity: self entity
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> serializationClass [
 	^ GtOllamaThreadMessage
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> tools [
 	^ tools
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaCompleteChatAPIClient >> tools: anObject [
 	tools := anObject
 ]

src/Gt4Ollama/GtOllamaProvider.class.st

@@ -1,32 +1,37 @@
 Class {
-	#name : #GtOllamaProvider,
-	#superclass : #GtLlmProvider,
+	#name : 'GtOllamaProvider',
+	#superclass : 'GtLlmProvider',
 	#instVars : [
 		'assistantWorking',
 		'model',
 		'client',
 		'modelfile',
 		'tools'
 	],
-	#category : #Gt4Ollama
+	#category : 'Gt4Ollama'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> addTool: aTool [
 	tools add: aTool
 ]
 
-{ #category : #accessing }
+{ #category : 'as yet unclassified' }
+GtOllamaProvider >> asyncWait [
+	self triggerAssistant
+]
+
+{ #category : 'accessing' }
 GtOllamaProvider >> client [
 	^ client
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaProvider >> client: anObject [
 	client := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> initialize [
 	super initialize.
 
@@ -37,12 +42,12 @@ GtOllamaProvider >> initialize [
 	tools := GtLlmToolsGroup new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> initializeClient [
 	client := GtOllamaClient new
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> instructions: aString [
 	| internalModelName modelFile |
 	internalModelName := 'gt-tutor-' , self model , '-' , self uuidClass new asString.
@@ -57,30 +62,30 @@ GtOllamaProvider >> instructions: aString [
 	self model: internalModelName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaProvider >> model [
 	^ model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaProvider >> model: anObject [
 	model := anObject.
 
 	"ignore pulling errors that occur on local models. worst case is we’ll get an issue later when trying to chat"
 	[ self client pullModel: model ] on: Error do: [  ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaProvider >> modelfile [
 	^ modelfile
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GtOllamaProvider >> modelfile: anObject [
 	modelfile := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> performToolCallsFor: aResult [
 	aResult toolCalls
 		do: [ :aToolCall | 
@@ -92,23 +97,24 @@ GtOllamaProvider >> performToolCallsFor: aResult [
 						output: toolOutput) ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> sendAssistantMessage: aMessage [
-	userMessageClass adoptInstance: aMessage.
-	aMessage role: 'user'.
-	self chat addMessage: aMessage.
+    | userMessage |
+	userMessage := userMessageClass new merge: aMessage.
+	userMessage role: 'user'.
+	self chat addMessage: userMessage.
 
-	[ self triggerAssistant ] asAsyncPromise
+	self asyncWait
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> status [
 	^ assistantWorking
 		ifTrue: [ GtLlmAssistantChatWorkingStatus new ]
 		ifFalse: [ GtLlmAssistantChatReadyStatus new ]
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GtOllamaProvider >> triggerAssistant [
 	| result |
 	assistantWorking := true.

src/properties.st

@@ -0,0 +1,4 @@
+{ 
+	#format : 'tonel',
+	#convention : 'RowanHybrid'
+}