Merge pull request #1 from Evref-BL/add-phi3-mini

add phi3 mini
Evref-BL · Jul 18, 2024 · a8eee6e · a8eee6e
2 parents 414acb6 + cbda8e5
commit a8eee6e
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 10 deletions.
diff --git a/src/BaselineOfPharoOllama/BaselineOfPharoOllama.class.st b/src/BaselineOfPharoOllama/BaselineOfPharoOllama.class.st
@@ -21,12 +21,13 @@ Internal Representation and Key Implementation Points.
     Implementation Points
 "
 Class {
-	#name : #BaselineOfPharoOllama,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfPharoOllama
+	#name : 'BaselineOfPharoOllama',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfPharoOllama',
+	#package : 'BaselineOfPharoOllama'
 }
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfPharoOllama >> baseline: spec [
 
 	<baseline>
@@ -36,22 +37,23 @@ BaselineOfPharoOllama >> baseline: spec [
 		self defineGroups: spec ]
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfPharoOllama >> defineDependencies: spec [
 
 	spec
 		baseline: 'NeoJSON'
 		with: [ spec repository: 'github://svenvc/NeoJSON/repository' ]
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfPharoOllama >> defineGroups: spec [
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfPharoOllama >> definePackages: spec [
 
 	spec package: 'Pharo-Ollama' with: [ spec requires: #( 'NeoJSON' ) ].
+	spec package: 'Pharo-Ollama-Tests' with: [ spec requires: #( 'Pharo-Ollama' ) ].
 
 	spec for: #'pharo10.x' do: [ 
 		spec

diff --git a/src/BaselineOfPharoOllama/package.st b/src/BaselineOfPharoOllama/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfPharoOllama }
+Package { #name : 'BaselineOfPharoOllama' }
diff --git a/src/Pharo-Ollama-Tests/OllamaAPITest.class.st b/src/Pharo-Ollama-Tests/OllamaAPITest.class.st
@@ -0,0 +1,24 @@
+"
+An OllamaAPITest is a test class for testing the behavior of OllamaAPI
+"
+Class {
+	#name : 'OllamaAPITest',
+	#superclass : 'TestCase',
+	#instVars : [
+		'ollama'
+	],
+	#category : 'Pharo-Ollama-Tests',
+	#package : 'Pharo-Ollama-Tests'
+}
+
+{ #category : 'running' }
+OllamaAPITest >> setUp [
+	super setUp.
+	ollama := OllamaAPI new.
+]
+
+{ #category : 'running' }
+OllamaAPITest >> testOllamaAPIHasDefaultModelInitialized [
+
+	self assert: (ollama model isKindOf: OModel)
+]
diff --git a/src/Pharo-Ollama-Tests/package.st b/src/Pharo-Ollama-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : 'Pharo-Ollama-Tests' }
diff --git a/src/Pharo-Ollama/OCodeLlamaModel.class.st b/src/Pharo-Ollama/OCodeLlamaModel.class.st
@@ -41,6 +41,15 @@ OCodeLlamaModel class >> code7b [
 		  yourself
 ]
 
+{ #category : 'accessing' }
+OCodeLlamaModel class >> codeLlama7binstructq3KS [
+
+	<ollamaInit: 'codellama:7b-instruct-q3_K_S'>
+	^ self new
+		  tag: '7b-instruct-q3_K_S';
+		  yourself
+]
+
 { #category : 'accessing' }
 OCodeLlamaModel class >> instruct7b [
 

diff --git a/src/Pharo-Ollama/OPhi3Model.class.st b/src/Pharo-Ollama/OPhi3Model.class.st
@@ -0,0 +1,30 @@
+Class {
+	#name : 'OPhi3Model',
+	#superclass : 'OModel',
+	#category : 'Pharo-Ollama',
+	#package : 'Pharo-Ollama'
+}
+
+{ #category : 'accessing' }
+OPhi3Model class >> medium [
+
+	<ollamaInit: 'phi3:medium'>
+	^ self new
+		  tag: 'medium';
+		  yourself
+]
+
+{ #category : 'accessing' }
+OPhi3Model class >> mini [
+
+	<ollamaInit: 'phi3:mini'>
+	^ self new
+		  tag: 'mini';
+		  yourself
+]
+
+{ #category : 'accessing' }
+OPhi3Model >> name [
+
+	^ 'phi3'
+]
diff --git a/src/Pharo-Ollama/OllamaAPI.class.st b/src/Pharo-Ollama/OllamaAPI.class.st
@@ -40,7 +40,7 @@ OllamaAPI class >> ollamaSettings: aBuilder [
 		with: [
 			(aBuilder pickOne: #defaultModel)
 				order: -100000;
-				label: 'HuggingFace Default model';
+				label: 'Ollama Default model';
 				target: self;
 				default: OCodeLlamaModel class >> #b7;
 				domainValues:
@@ -122,7 +122,10 @@ OllamaAPI >> initialize [
 	super initialize.
 	host := '127.0.0.1'.
 	port := 11434.
-	model := self class defaultModel.
+	model := self class defaultModel
+		         valueWithReceiver:
+		         self class defaultModel methodClass instanceSide
+		         arguments: {  }.
 	stream := false
 ]