chore: refactoring

README.md

@@ -21,7 +21,9 @@ console.log(response.message.content)
 ```
 
 ### Browser Usage
+
 To use the library without node, import the browser module.
+
 ```javascript
 import ollama from 'ollama/browser'
 ```

src/browser.ts

@@ -22,6 +22,7 @@
   ShowResponse,
   StatusResponse,
 } from './interfaces.js'
+import { EMPTY_STRING, MESSAGES, OLLAMA_LOCAL_URL, REQUEST_CONSTANTS } from './constants'
 
 export class Ollama {
   protected readonly config: Config
@@ -30,14 +31,15 @@
 
   constructor(config?: Partial<Config>) {
     this.config = {
-      host: '',
+      host: EMPTY_STRING,
     }
     if (!config?.proxy) {
-      this.config.host = utils.formatHost(config?.host ?? 'http://127.0.0.1:11434')
+      this.config.host = utils.formatHost(config?.host ?? OLLAMA_LOCAL_URL)
     }
 
     this.fetch = fetch
-    if (config?.fetch != null) {
+    // NOTE: fetch could either be undefined or an instance of Fetch
+    if (config?.fetch) {
       this.fetch = config.fetch
     }
 
@@ -63,7 +65,7 @@
    */
   protected async processStreamableRequest<T extends object>(
     endpoint: string,
     request: { stream?: boolean } & Record<string, any>,
   ): Promise<T | AsyncGenerator<T>> {
     request.stream = request.stream ?? false
     const response = await utils.post(
@@ -76,7 +78,7 @@
     )
 
     if (!response.body) {
-      throw new Error('Missing body')
+      throw new Error(MESSAGES.MISSING_BODY)
     }
 
     const itr = utils.parseJSON<T | ErrorResponse>(response.body)
@@ -90,19 +92,18 @@
           yield message
           // message will be done in the case of chat and generate
           // message will be success in the case of a progress response (pull, push, create)
-          if ((message as any).done || (message as any).status === 'success') {
+          if ((message as any).done || (message as any).status === MESSAGES.SUCCESS) {
             return
           }
         }
         throw new Error('Did not receive done or success response in stream.')
       })()
-    } else {
-      const message = await itr.next()
-      if (!message.value.done && (message.value as any).status !== 'success') {
-        throw new Error('Expected a completed response.')
-      }
-      return message.value
     }
+    const message = await itr.next()
+    if (!message.value.done && (message.value as any).status !== MESSAGES.SUCCESS) {
+      throw new Error('Expected a completed response.')
+    }
+    return message.value
   }
 
   /**
@@ -141,7 +142,10 @@
     if (request.images) {
       request.images = await Promise.all(request.images.map(this.encodeImage.bind(this)))
     }
-    return this.processStreamableRequest<GenerateResponse>('generate', request)
+    return this.processStreamableRequest<GenerateResponse>(
+      REQUEST_CONSTANTS.GENERATE,
+      request,
+    )
   }
 
   chat(request: ChatRequest & { stream: true }): Promise<AsyncGenerator<ChatResponse>>
@@ -179,11 +183,10 @@
   async create(
     request: CreateRequest,
   ): Promise<ProgressResponse | AsyncGenerator<ProgressResponse>> {
-    return this.processStreamableRequest<ProgressResponse>('create', {
+    return this.processStreamableRequest<ProgressResponse>(REQUEST_CONSTANTS.CREATE, {
       name: request.model,
       stream: request.stream,
       modelfile: request.modelfile,
-      quantize: request.quantize,
     })
   }
 
@@ -199,7 +202,7 @@
   async pull(
     request: PullRequest,
   ): Promise<ProgressResponse | AsyncGenerator<ProgressResponse>> {
-    return this.processStreamableRequest<ProgressResponse>('pull', {
+    return this.processStreamableRequest<ProgressResponse>(REQUEST_CONSTANTS.PULL, {
       name: request.model,
       stream: request.stream,
       insecure: request.insecure,
@@ -218,7 +221,7 @@
   async push(
     request: PushRequest,
   ): Promise<ProgressResponse | AsyncGenerator<ProgressResponse>> {
-    return this.processStreamableRequest<ProgressResponse>('push', {
+    return this.processStreamableRequest<ProgressResponse>(REQUEST_CONSTANTS.PUSH, {
       name: request.model,
       stream: request.stream,
       insecure: request.insecure,
@@ -235,7 +238,7 @@
     await utils.del(this.fetch, `${this.config.host}/api/delete`, {
       name: request.model,
     })
-    return { status: 'success' }
+    return { status: MESSAGES.SUCCESS }
   }
 
   /**
@@ -246,7 +249,7 @@
    */
   async copy(request: CopyRequest): Promise<StatusResponse> {
     await utils.post(this.fetch, `${this.config.host}/api/copy`, { ...request })
-    return { status: 'success' }
+    return { status: MESSAGES.SUCCESS }
   }
 
   /**

src/constants/index.ts

@@ -0,0 +1,52 @@
+const EMPTY_STRING = ''
+const CODE_404 = '404'
+const PROTOCOLS = {
+  HTTP: 'http',
+  HTTPS: 'https',
+} as const
+const PORTS = {
+  HTTP: '80',
+  HTTPS: '443',
+} as const
+const MESSAGES = {
+  MISSING_BODY: 'Missing body',
+  SUCCESS: 'Success',
+  FETCHING_TEXT: 'Getting text from response',
+  ERROR_FETCHING_TEXT: 'Failed to get text from error response',
+  ERROR_NO_MODEL_FILE: 'Must provide either path or modelfile to create a model',
+  ERROR_JSON_PARSE: 'Failed to parse error response as JSON',
+  STREAMING_UPLOADS_NOT_SUPPORTED:
+    'Streaming uploads are not supported in this environment.',
+} as const
+const REQUEST_CONSTANTS = {
+  GENERATE: 'generate',
+  CREATE: 'create',
+  PUSH: 'push',
+  PULL: 'pull',
+} as const
+const STREAMING_EVENTS = {
+  DATA: 'data',
+  END: 'end',
+  ERROR: 'error',
+} as const
+const MODEL_FILE_COMMANDS = ['FROM', 'ADAPTER']
+const OLLAMA_LOCAL_URL = 'http://127.0.0.1:11434'
+const SHA256 = 'sha256'
+const ENCODING = {
+  HEX: 'hex',
+  BASE64: 'base64',
+  UTF8: 'utf8',
+} as const
+export {
+  EMPTY_STRING,
+  CODE_404,
+  PROTOCOLS,
+  PORTS,
+  MESSAGES,
+  REQUEST_CONSTANTS,
+  STREAMING_EVENTS,
+  MODEL_FILE_COMMANDS,
+  OLLAMA_LOCAL_URL,
+  SHA256,
+  ENCODING,
+}