Merge pull request #1347 from narengogi/fix/image-edits-route-cleaner-implementation

cleaner implementation for image edits route

Author: VisargD

src/handlers/services/cacheService.ts

@@ -35,6 +35,7 @@ export class CacheService {
       'createFinetune',
       'retrieveFinetune',
       'cancelFinetune',
+      'imageEdit',
     ];
     return !nonCacheEndpoints.includes(endpoint);
   }

src/handlers/services/requestContext.ts

@@ -87,6 +87,8 @@ export class RequestContext {
   }
 
   get isStreaming(): boolean {
+    if (this.endpoint === 'imageEdit' && this.requestBody instanceof FormData)
+      return this.requestBody.get('stream') === 'true';
     return this.params.stream === true;
   }
 

src/providers/azure-ai-inference/api.ts

@@ -50,9 +50,12 @@ const AzureAIInferenceAPI: ProviderAPIConfig = {
       ...(azureDeploymentName && {
         'azureml-model-deployment': azureDeploymentName,
       }),
-      ...(['createTranscription', 'createTranslation', 'uploadFile'].includes(
-        fn
-      )
+      ...([
+        'createTranscription',
+        'createTranslation',
+        'uploadFile',
+        'imageEdit',
+      ].includes(fn)
         ? {
             'Content-Type': 'multipart/form-data',
           }
@@ -119,6 +122,7 @@ const AzureAIInferenceAPI: ProviderAPIConfig = {
       embed: '/embeddings',
       realtime: '/realtime',
       imageGenerate: '/images/generations',
+      imageEdit: '/images/edits',
       createSpeech: '/audio/speech',
       createTranscription: '/audio/transcriptions',
       createTranslation: '/audio/translations',
@@ -165,6 +169,7 @@ const AzureAIInferenceAPI: ProviderAPIConfig = {
       }
       case 'realtime':
       case 'imageGenerate':
+      case 'imageEdit':
       case 'createSpeech':
       case 'createTranscription':
       case 'createTranslation':

src/providers/azure-ai-inference/index.ts

@@ -32,6 +32,7 @@ const AzureAIInferenceAPIConfig: ProviderConfigs = {
   api: AzureAIInferenceAPI,
   chatComplete: AzureAIInferenceChatCompleteConfig,
   imageGenerate: AzureOpenAIImageGenerateConfig,
+  imageEdit: {},
   createSpeech: AzureOpenAICreateSpeechConfig,
   createFinetune: OpenAICreateFinetuneConfig,
   createTranscription: {},

src/providers/azure-ai-inference/utils.ts

@@ -1,6 +1,5 @@
 import { AZURE_AI_INFERENCE } from '../../globals';
 import { OpenAIErrorResponseTransform } from '../openai/utils';
-import { ErrorResponse } from '../types';
 
 export const AzureAIInferenceResponseTransform = (
   response: any,

src/providers/azure-openai/api.ts

@@ -45,7 +45,8 @@ const AzureOpenAIAPIConfig: ProviderAPIConfig = {
     if (
       fn === 'createTranscription' ||
       fn === 'createTranslation' ||
-      fn === 'uploadFile'
+      fn === 'uploadFile' ||
+      fn === 'imageEdit'
     ) {
       headersObj['Content-Type'] = 'multipart/form-data';
     }

src/providers/azure-openai/imageEdits.ts

@@ -36,17 +36,13 @@ import {
   OpenAIListInputItemsResponseTransformer,
 } from '../open-ai-base';
 import { AZURE_OPEN_AI } from '../../globals';
-import {
-  AzureOpenAIImageEditConfig,
-  AzureOpenAIImageEditResponseTransform,
-} from './imageEdits';
 
 const AzureOpenAIConfig: ProviderConfigs = {
   complete: AzureOpenAICompleteConfig,
   embed: AzureOpenAIEmbedConfig,
   api: AzureOpenAIAPIConfig,
   imageGenerate: AzureOpenAIImageGenerateConfig,
-  imageEdit: AzureOpenAIImageEditConfig,
+  imageEdit: {},
   chatComplete: AzureOpenAIChatCompleteConfig,
   createSpeech: AzureOpenAICreateSpeechConfig,
   createFinetune: OpenAICreateFinetuneConfig,
@@ -68,7 +64,6 @@ const AzureOpenAIConfig: ProviderConfigs = {
     chatComplete: AzureOpenAIResponseTransform,
     embed: AzureOpenAIEmbedResponseTransform,
     imageGenerate: AzureOpenAIImageGenerateResponseTransform,
-    imageEdit: AzureOpenAIImageEditResponseTransform,
     createSpeech: AzureOpenAICreateSpeechResponseTransform,
     createTranscription: AzureOpenAICreateTranscriptionResponseTransform,
     createTranslation: AzureOpenAICreateTranslationResponseTransform,

src/providers/azure-openai/index.ts

@@ -17,7 +17,8 @@ const OpenAIAPIConfig: ProviderAPIConfig = {
     if (
       fn === 'createTranscription' ||
       fn === 'createTranslation' ||
-      fn === 'uploadFile'
+      fn === 'uploadFile' ||
+      fn === 'imageEdit'
     )
       headersObj['Content-Type'] = 'multipart/form-data';