Ensure ifNotNil: receives blocks [feenkcom/gtoolkit#4322]

feenkcom · Mar 3, 2025 · 48f1e06 · 48f1e06
1 parent 0174b02
commit 48f1e06
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 35 deletions.
diff --git a/src/Gt4Llm-GToolkit/GtLlmActionTemplateElement.class.st b/src/Gt4Llm-GToolkit/GtLlmActionTemplateElement.class.st
@@ -76,7 +76,7 @@ GtLlmActionTemplateElement >> exampleStringFor: anObject [
 					ifTrue: [ '''Action'' -> ''' asRopedText , tutorNameAttribute codeEditor
 							, '''' asRopedText ]
 					ifFalse: [ (aPair key storeString , ' -> '
-							, (aPair value ifNil: [ 'nil' ] ifNotNil: #storeString)) asRopedText ] ]
+							, (aPair value ifNil: [ 'nil' ] ifNotNil: [ :aValue | aValue storeString ])) asRopedText ] ]
 			separatedBy: '. ' asRopedText.
 
 	finalRope := '' asRopedText.
@@ -95,7 +95,7 @@ GtLlmActionTemplateElement >> finalExampleStringFor: anObject [
 					ifTrue: [ '''Action'' -> ''' asRopedText , tutorNameAttribute string
 							, '''' asRopedText ]
 					ifFalse: [ (aPair key storeString , ' -> '
-							, (aPair value ifNil: [ 'nil' ] ifNotNil: #storeString)) asRopedText ] ]
+							, (aPair value ifNil: [ 'nil' ] ifNotNil: [ :aValue | aValue storeString ])) asRopedText ] ]
 			separatedBy: '. ' asRopedText.
 
 	finalRope := '' asRopedText.

diff --git a/src/Gt4Llm/GtLlmActionMessage.class.st b/src/Gt4Llm/GtLlmActionMessage.class.st
@@ -13,7 +13,8 @@ GtLlmActionMessage class >> defaultRole [
 GtLlmActionMessage >> actionModel [
 	^ (self chat tutor actionNamed: self action)
 		ifNil: [ self isUserRole
-				ifTrue: [ (self chat descendantOf: self) ifNotNil: #actionModel ]
+				ifTrue: [ (self chat descendantOf: self)
+						ifNotNil: [ :aDescendant | aDescendant actionModel ] ]
 				ifFalse: [ nil ] ]
 ]
 

diff --git a/src/Gt4Llm/GtLlmTutorAction.class.st b/src/Gt4Llm/GtLlmTutorAction.class.st
@@ -177,11 +177,12 @@ GtLlmTutorAction >> initialize [
 	self name: ''.
 	self description: ''.
 
-	definingMethod := (thisContext stack at: 3) blocDefiningMethod.
-	SystemAnnouncer uniqueInstance weak
-		when: MethodModified
-		send: #onMethodModified:
-		to: self
+	definingMethod := self initializeMethod
+]
+
+{ #category : #accessing }
+GtLlmTutorAction >> initializeMethod [
+	^ (thisContext stack at: 3) blocDefiningMethod
 ]
 
 { #category : #accessing }
@@ -201,13 +202,6 @@ GtLlmTutorAction >> name: anObject [
 	self format isEmptyOrNil ifTrue: [ self format: name ]
 ]
 
-{ #category : #accessing }
-GtLlmTutorAction >> onMethodModified: aMethodModified [
-	definingMethod = aMethodModified ifFalse: [ ^ self ].
-
-	self become: aMethodModified value
-]
-
 { #category : #accessing }
 GtLlmTutorAction >> onTutorChanged [
 	self examples do: [ :anExample | anExample verify resolveReferences ]
@@ -262,7 +256,7 @@ GtLlmTutorAction >> priority: anObject [
 
 { #category : #'as yet unclassified' }
 GtLlmTutorAction >> removeFromSystem [
-	self definingMethod ifNotNil: #removeFromSystem
+	self definingMethod ifNotNil: [ :aMethod | aMethod removeFromSystem ]
 ]
 
 { #category : #accessing }

diff --git a/src/Gt4Llm/GtLlmTutorActionExample.class.st b/src/Gt4Llm/GtLlmTutorActionExample.class.st
@@ -29,14 +29,16 @@ GtLlmTutorActionExample >> asExpressionSource [
 	input: { '
 		, ('. '
 				join: (self input associations
-						collect: [ :aPair | '''' , aPair key , ''' -> ' , (aPair value ifNil: [ 'nil' ] ifNotNil: #storeString) ]))
+						collect: [ :aPair | 
+							'''' , aPair key , ''' -> '
+								, (aPair value ifNil: [ 'nil' ] ifNotNil: [ :aValue | aValue storeString ]) ]))
 		, ' } asDictionary;
 	output: { '
 		, ('. '
 				join: (self output associations
 						collect: [ :aPair | 
 							'''' , aPair key , ''' -> '
-								, (aPair value ifNil: [ 'nil' ] ifNotNil: #storeString) ]))
+								, (aPair value ifNil: [ 'nil' ] ifNotNil:[ :aValue | aValue storeString ]) ]))
 		, ' } asDictionary'
 ]
 

diff --git a/src/Gt4Llm/GtLlmTutorFormatDescription.class.st b/src/Gt4Llm/GtLlmTutorFormatDescription.class.st
@@ -154,7 +154,12 @@ GtLlmTutorFormatDescription >> initialize [
 
 	referencingActions := OrderedCollection new.
 
-	definingMethod := (thisContext stack at: 3) blocDefiningMethod
+	definingMethod := self initializeMethod
+]
+
+{ #category : #accessing }
+GtLlmTutorFormatDescription >> initializeMethod [
+	^ (thisContext stack at: 4) blocDefiningMethod
 ]
 
 { #category : #accessing }
@@ -189,7 +194,7 @@ GtLlmTutorFormatDescription >> priority: anObject [
 
 { #category : #'as yet unclassified' }
 GtLlmTutorFormatDescription >> removeFromSystem [
-	self definingMethod ifNotNil: #removeFromSystem
+	self definingMethod ifNotNil: [ :aMethod | aMethod removeFromSystem ]
 ]
 
 { #category : #accessing }

diff --git a/src/Gt4Llm/TGtActionMessage.trait.st b/src/Gt4Llm/TGtActionMessage.trait.st
@@ -7,7 +7,8 @@ Trait {
 TGtActionMessage >> actionModel [
 	^ (self chat tutor actionNamed: self action)
 		ifNil: [ self isUserRole
-				ifTrue: [ (self chat descendantOf: self) ifNotNil: #actionModel ]
+				ifTrue: [ (self chat descendantOf: self)
+						ifNotNil: [ :aDescendant | aDescendant actionModel ] ]
 				ifFalse: [ nil ] ]
 ]
 

diff --git a/src/Gt4Ollama/GtOllamaThreadMessage.class.st b/src/Gt4Ollama/GtOllamaThreadMessage.class.st
@@ -80,7 +80,7 @@ GtOllamaThreadMessage >> evalDuration [
 
 { #category : #accessing }
 GtOllamaThreadMessage >> evalDuration: anObject [
-	evalDuration := anObject ifNotNil: #nanoSeconds
+	evalDuration := anObject ifNotNil: [ :aValue | aValue nanoseconds ]
 ]
 
 { #category : #accessing }

diff --git a/src/Gt4OpenAI-GToolkit/GtOpenAIClient.extension.st b/src/Gt4OpenAI-GToolkit/GtOpenAIClient.extension.st
@@ -1,5 +1,17 @@
 Extension { #name : #GtOpenAIClient }
 
+{ #category : #'*Gt4OpenAI-GToolkit' }
+GtOpenAIClient >> initializeClient [
+	| aClient |
+	aClient := ZnClient new.
+	aClient forJsonREST.
+	aClient headerAt: 'OpenAI-Beta' put: 'assistants=v2'.
+	aClient timeout: 60.
+	aClient setBearerAuthentication: apiKey.
+	aClient beOneShot.
+	^ aClient
+]
+
 { #category : #'*Gt4OpenAI-GToolkit' }
 GtOpenAIClient class >> withApiKeyFromClipboard [
 	^ self new apiKey: Clipboard clipboardText

diff --git a/src/Gt4OpenAI/GtOpenAIAnnotationsGroup.class.st b/src/Gt4OpenAI/GtOpenAIAnnotationsGroup.class.st
@@ -14,5 +14,5 @@ GtOpenAIAnnotationsGroup >> gtAnnotationsFor: aView [
 		column: 'Text' text: #text;
 		column: 'Type' text: #type;
 		column: 'File'
-			text: [ :anAnnotation | anAnnotation file ifNil: [ '' ] ifNotNil: #filename ]
+			text: [ :anAnnotation | anAnnotation file ifNil: [ '' ] ifNotNil: [ :aFile | aFile filename ] ]
 ]
diff --git a/src/Gt4OpenAI/GtOpenAIClient.class.st b/src/Gt4OpenAI/GtOpenAIClient.class.st
@@ -282,18 +282,6 @@ GtOpenAIClient >> initialize [
 	self baseUrl: self defaultBaseUrl
 ]
 
-{ #category : #accessing }
-GtOpenAIClient >> initializeClient [
-	| aClient |
-	aClient := ZnClient new.
-	aClient forJsonREST.
-	aClient headerAt: 'OpenAI-Beta' put: 'assistants=v2'.
-	aClient timeout: 60.
-	aClient setBearerAuthentication: apiKey.
-	aClient beOneShot.
-	^ aClient
-]
-
 { #category : #accessing }
 GtOpenAIClient >> listAssistants [
 	^ GtOpenAIListAssistantsAPIClient new