resolve conflicts.

huggingface · Oct 3, 2023 · 0ceda42 · 0ceda42
2 parents 2c8a03f + 425251c
commit 0ceda42
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/js/src/lib/components/InferenceWidget/InferenceWidget.svelte b/js/src/lib/components/InferenceWidget/InferenceWidget.svelte
@@ -66,7 +66,11 @@
 		"token-classification": TokenClassificationWidget,
 		"text-to-image": TextToImageWidget,
 		"text-to-speech": TextToSpeechWidget,
+<<<<<<< HEAD
 		"text-to-audio": TextToSpeechWidget,		
+=======
+		"text-to-audio": TextToAudioWidget,
+>>>>>>> 425251c97dfdc18b8fe67dae13d0166e32f649c7
 		"translation": TextGenerationWidget,
 		"tabular-classification": TabularDataWidget,
 		"tabular-regression": TabularDataWidget,

diff --git a/js/src/lib/components/PipelineIcon/PipelineIcon.svelte b/js/src/lib/components/PipelineIcon/PipelineIcon.svelte
@@ -60,7 +60,7 @@
 		"fill-mask": IconFillMask,
 		"sentence-similarity": IconSentenceSimilarity,
 		"text-to-speech": IconTextToSpeech,
-		"text-to-audio": IconTextToAudio,		
+		"text-to-audio": IconTextToAudio,
 		"automatic-speech-recognition": IconAutomaticSpeechRecognition,
 		"audio-to-audio": IconAudioToAudio,
 		"audio-classification": IconAudioClassification,

diff --git a/js/src/lib/inferenceSnippets/inputs.ts b/js/src/lib/inferenceSnippets/inputs.ts
@@ -99,7 +99,7 @@ const modelInputSnippets: {
 	"text-generation":              inputsTextGeneration,
 	"text-to-image":                inputsTextToImage,
 	"text-to-speech":               inputsTextToSpeech,
-	"text-to-audio":                inputsTextToAudio,	
+	"text-to-audio":                inputsTextToAudio,
 	"text2text-generation":         inputsText2TextGeneration,
 	"token-classification":         inputsTokenClassification,
 	"translation":                  inputsTranslation,

diff --git a/js/src/lib/inferenceSnippets/serveCurl.ts b/js/src/lib/inferenceSnippets/serveCurl.ts
@@ -42,7 +42,7 @@ export const curlSnippets: Partial<Record<PipelineType, (model: ModelData, acces
 	"automatic-speech-recognition": snippetFile,
 	"text-to-image":                snippetBasic,
 	"text-to-speech":               snippetBasic,
-	"text-to-audio":                snippetBasic,	
+	"text-to-audio":                snippetBasic,
 	"audio-to-audio":               snippetFile,
 	"audio-classification":         snippetFile,
 	"image-classification":         snippetFile,

diff --git a/js/src/lib/inferenceSnippets/serveJs.ts b/js/src/lib/inferenceSnippets/serveJs.ts
@@ -93,7 +93,7 @@ export const jsSnippets: Partial<Record<PipelineType, (model: ModelData, accessT
 	"automatic-speech-recognition": snippetFile,
 	"text-to-image":                snippetTextToImage,
 	"text-to-speech":               snippetBasic,
-	"text-to-audio":                snippetBasic,	
+	"text-to-audio":                snippetBasic,
 	"audio-to-audio":               snippetFile,
 	"audio-classification":         snippetFile,
 	"image-classification":         snippetFile,

diff --git a/js/src/lib/interfaces/Types.ts b/js/src/lib/interfaces/Types.ts
@@ -325,7 +325,7 @@ export const PIPELINE_DATA = ensureRecordOfPipelines({
 		name:     "Text-to-Audio",
 		modality: "audio",
 		color:    "yellow",
-	},	
+	},
 	"automatic-speech-recognition": {
 		name:     "Automatic Speech Recognition",
 		modality: "audio",