Skip to content

Commit eb466bb

Browse files
schmidt-sebastianschmidt-sebastian
committed
Use consistent file naming
1 parent 8ed8bad commit eb466bb

18 files changed

Lines changed: 43 additions & 43 deletions

‎src/main.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616

1717
import './app_clean.css';
18-
import { setupObjectDetection, cleanupObjectDetection } from './tasks/object-detection';
19-
import { setupImageSegmentation, cleanupImageSegmentation } from './tasks/image-segmentation';
18+
import { setupObjectDetector, cleanupObjectDetector } from './tasks/object-detector';
19+
import { setupImageSegmenter, cleanupImageSegmenter } from './tasks/image-segmenter';
2020
import { setupAudioClassifier, cleanupAudioClassifier } from './tasks/audio-classifier';
21-
import { setupTextClassification, cleanupTextClassification } from './tasks/text-classification';
22-
import { setupTextEmbedding, cleanupTextEmbedding } from './tasks/text-embedding';
21+
import { setupTextClassifier, cleanupTextClassifier } from './tasks/text-classifier';
22+
import { setupTextEmbedder, cleanupTextEmbedder } from './tasks/text-embedder';
2323
import { setupFaceDetector, cleanupFaceDetector } from './tasks/face-detector';
2424
import { setupFaceLandmarker, cleanupFaceLandmarker } from './tasks/face-landmarker';
2525
import { setupHandLandmarker, cleanupHandLandmarker } from './tasks/hand-landmarker';
@@ -75,8 +75,8 @@ const mainContent = app.querySelector('.main-content') as HTMLElement;
7575
// 4. Router Setup
7676
const routes = {
7777
'/vision/object_detector': {
78-
setup: setupObjectDetection,
79-
cleanup: cleanupObjectDetection,
78+
setup: setupObjectDetector,
79+
cleanup: cleanupObjectDetector,
8080
label: 'Object Detection',
8181
},
8282
'/vision/face_detector': { setup: setupFaceDetector, cleanup: cleanupFaceDetector, label: 'Face Detection' },
@@ -104,8 +104,8 @@ const routes = {
104104
label: 'Interactive Segmenter',
105105
},
106106
'/vision/image_segmenter': {
107-
setup: setupImageSegmentation,
108-
cleanup: cleanupImageSegmentation,
107+
setup: setupImageSegmenter,
108+
cleanup: cleanupImageSegmenter,
109109
label: 'Image Segmentation',
110110
},
111111
'/vision/image_embedder': { setup: setupImageEmbedder, cleanup: cleanupImageEmbedder, label: 'Image Embedding' },
@@ -115,16 +115,16 @@ const routes = {
115115
label: 'Audio Classifier',
116116
},
117117
'/text/text_classifier': {
118-
setup: setupTextClassification,
119-
cleanup: cleanupTextClassification,
118+
setup: setupTextClassifier,
119+
cleanup: cleanupTextClassifier,
120120
label: 'Text Classification',
121121
},
122122
'/text/language_detector': {
123123
setup: setupLanguageDetector,
124124
cleanup: cleanupLanguageDetector,
125125
label: 'Language Detection',
126126
},
127-
'/text/text_embedder': { setup: setupTextEmbedding, cleanup: cleanupTextEmbedding, label: 'Text Embedding' },
127+
'/text/text_embedder': { setup: setupTextEmbedder, cleanup: cleanupTextEmbedder, label: 'Text Embedding' },
128128
};
129129

130130
let currentCleanup: (() => void) | undefined;

src/tasks/image-segmentation.ts renamed to src/tasks/image-segmenter.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import { BaseVisionTask } from '../components/base-vision-task';
1818

1919
// @ts-ignore
20-
import template from '../templates/image-segmentation.html?raw';
20+
import template from '../templates/image-segmenter.html?raw';
2121
// @ts-ignore
2222

2323
// Definitions for Custom Drawing Output
@@ -55,7 +55,7 @@ const standardModels: Record<string, string> = {
5555
'https://storage.googleapis.com/mediapipe-models/image_segmenter/selfie_multiclass_256x256/float32/latest/selfie_multiclass_256x256.tflite',
5656
};
5757

58-
class ImageSegmentationTask extends BaseVisionTask {
58+
class ImageSegmenterTask extends BaseVisionTask {
5959
private outputType: 'CATEGORY_MASK' | 'CONFIDENCE_MASKS' = 'CATEGORY_MASK';
6060
private labels: string[] = [];
6161
private confidenceMaskSelection = 0;
@@ -393,24 +393,24 @@ class ImageSegmentationTask extends BaseVisionTask {
393393
protected override displayVideoResult() {}
394394
}
395395

396-
let activeTask: ImageSegmentationTask | null = null;
396+
let activeTask: ImageSegmenterTask | null = null;
397397

398-
export async function setupImageSegmentation(container: HTMLElement) {
399-
activeTask = new ImageSegmentationTask({
398+
export async function setupImageSegmenter(container: HTMLElement) {
399+
activeTask = new ImageSegmenterTask({
400400
container,
401401
template,
402402
defaultModelName: 'deeplab_v3',
403403
defaultModelUrl:
404404
'https://storage.googleapis.com/mediapipe-models/image_segmenter/deeplab_v3/float32/1/deeplab_v3.tflite',
405405
workerFactory: () =>
406-
new Worker(new URL('../workers/image-segmentation.worker.ts', import.meta.url), { type: 'module' }),
406+
new Worker(new URL('../workers/image-segmenter.worker.ts', import.meta.url), { type: 'module' }),
407407
defaultDelegate: 'GPU',
408408
});
409409

410410
await activeTask.initialize();
411411
}
412412

413-
export function cleanupImageSegmentation() {
413+
export function cleanupImageSegmenter() {
414414
if (activeTask) {
415415
activeTask.cleanup();
416416
activeTask = null;

src/tasks/object-detection.ts renamed to src/tasks/object-detector.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import { ObjectDetectorResult, DrawingUtils } from '@mediapipe/tasks-vision';
1818
import { BaseVisionTask } from '../components/base-vision-task';
1919

2020
// @ts-ignore
21-
import template from '../templates/object-detection.html?raw';
21+
import template from '../templates/object-detector.html?raw';
2222
// @ts-ignore
2323

24-
class ObjectDetectionTask extends BaseVisionTask {
24+
class ObjectDetectorTask extends BaseVisionTask {
2525
private scoreThreshold = 0.5;
2626
private maxResults = 3;
2727

@@ -164,23 +164,23 @@ class ObjectDetectionTask extends BaseVisionTask {
164164
}
165165

166166
// Singleton instance
167-
let activeTask: ObjectDetectionTask | null = null;
167+
let activeTask: ObjectDetectorTask | null = null;
168168

169-
export async function setupObjectDetection(container: HTMLElement) {
170-
activeTask = new ObjectDetectionTask({
169+
export async function setupObjectDetector(container: HTMLElement) {
170+
activeTask = new ObjectDetectorTask({
171171
container,
172172
template,
173173
defaultModelName: 'efficientdet_lite0',
174174
defaultModelUrl:
175175
'https://storage.googleapis.com/mediapipe-models/object_detector/efficientdet_lite0/float32/1/efficientdet_lite0.tflite',
176176
workerFactory: () =>
177-
new Worker(new URL('../workers/object-detection.worker.ts', import.meta.url), { type: 'module' }),
177+
new Worker(new URL('../workers/object-detector.worker.ts', import.meta.url), { type: 'module' }),
178178
});
179179

180180
await activeTask.initialize();
181181
}
182182

183-
export function cleanupObjectDetection() {
183+
export function cleanupObjectDetector() {
184184
if (activeTask) {
185185
activeTask.cleanup();
186186
activeTask = null;

src/tasks/text-classification.ts renamed to src/tasks/text-classifier.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616

1717
// @ts-ignore
18-
import template from '../templates/text-classification.html?raw';
18+
import template from '../templates/text-classifier.html?raw';
1919

2020
import { BaseTextTask } from '../components/base-text-task';
2121
import { ClassificationResult, ClassificationItem } from '../components/classification-result';
2222

2323
// @ts-ignore
2424

25-
class TextClassificationTask extends BaseTextTask {
25+
class TextClassifierTask extends BaseTextTask {
2626
private classificationResultUI: ClassificationResult | undefined;
2727
private textInput!: HTMLTextAreaElement;
2828
private classifyBtn!: HTMLButtonElement;
@@ -156,24 +156,24 @@ class TextClassificationTask extends BaseTextTask {
156156
}
157157
}
158158

159-
let activeTask: TextClassificationTask | null = null;
159+
let activeTask: TextClassifierTask | null = null;
160160

161-
export async function setupTextClassification(container: HTMLElement) {
162-
activeTask = new TextClassificationTask({
161+
export async function setupTextClassifier(container: HTMLElement) {
162+
activeTask = new TextClassifierTask({
163163
container,
164164
template,
165165
defaultModelName: 'bert_classifier',
166166
defaultModelUrl:
167167
'https://storage.googleapis.com/mediapipe-models/text_classifier/bert_classifier/float32/1/bert_classifier.tflite',
168168
workerFactory: () =>
169-
new Worker(new URL('../workers/text-classification.worker.ts', import.meta.url), { type: 'module' }),
169+
new Worker(new URL('../workers/text-classifier.worker.ts', import.meta.url), { type: 'module' }),
170170
defaultDelegate: 'CPU',
171171
});
172172

173173
await activeTask.initialize();
174174
}
175175

176-
export function cleanupTextClassification() {
176+
export function cleanupTextClassifier() {
177177
if (activeTask) {
178178
activeTask.cleanup();
179179
activeTask = null;

src/tasks/text-embedding.ts renamed to src/tasks/text-embedder.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
// @ts-ignore
18-
import template from '../templates/text-embedding.html?raw';
18+
import template from '../templates/text-embedder.html?raw';
1919

2020
import { BaseTextTask } from '../components/base-text-task';
2121

2222
// @ts-ignore
2323

24-
class TextEmbeddingTask extends BaseTextTask {
24+
class TextEmbedderTask extends BaseTextTask {
2525
private embedBtn!: HTMLButtonElement;
2626
private textInput1!: HTMLTextAreaElement;
2727
private textInput2!: HTMLTextAreaElement;
@@ -156,23 +156,23 @@ class TextEmbeddingTask extends BaseTextTask {
156156
}
157157
}
158158

159-
let activeTask: TextEmbeddingTask | null = null;
159+
let activeTask: TextEmbedderTask | null = null;
160160

161-
export async function setupTextEmbedding(container: HTMLElement) {
162-
activeTask = new TextEmbeddingTask({
161+
export async function setupTextEmbedder(container: HTMLElement) {
162+
activeTask = new TextEmbedderTask({
163163
container,
164164
template,
165165
defaultModelName: 'universal_sentence_encoder',
166166
defaultModelUrl:
167167
'https://storage.googleapis.com/mediapipe-models/text_embedder/universal_sentence_encoder/float32/1/universal_sentence_encoder.tflite',
168-
workerFactory: () => new Worker(new URL('../workers/text-embedding.worker', import.meta.url), { type: 'module' }),
168+
workerFactory: () => new Worker(new URL('../workers/text-embedder.worker.ts', import.meta.url), { type: 'module' }),
169169
defaultDelegate: 'CPU',
170170
});
171171

172172
await activeTask.initialize();
173173
}
174174

175-
export function cleanupTextEmbedding() {
175+
export function cleanupTextEmbedder() {
176176
if (activeTask) {
177177
activeTask.cleanup();
178178
activeTask = null;

src/templates/image-segmentation.html renamed to src/templates/image-segmenter.html

File renamed without changes.

src/templates/object-detection.html renamed to src/templates/object-detector.html

File renamed without changes.

src/templates/text-classification.html renamed to src/templates/text-classifier.html

File renamed without changes.

src/templates/text-embedding.html renamed to src/templates/text-embedder.html

File renamed without changes.

‎src/ui/sidebar.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ export function renderSidebar(container: HTMLElement) {
3333
<li><a href="#/vision/holistic_landmarker" class="nav-button" data-task="holistic-landmarker">Holistic Landmarker</a></li>
3434
<li><a href="#/vision/image_classifier" class="nav-button" data-task="image-classifier">Image Classifier</a></li>
3535
<li><a href="#/vision/image_embedder" class="nav-button" data-task="image-embedder">Image Embedding</a></li>
36-
<li><a href="#/vision/image_segmenter" class="nav-button" data-task="image-segmentation">Image Segmentation</a></li>
36+
<li><a href="#/vision/image_segmenter" class="nav-button" data-task="image-segmenter">Image Segmentation</a></li>
3737
<li><a href="#/vision/interactive_segmenter" class="nav-button" data-task="interactive-segmenter">Interactive Segmenter</a></li>
38-
<li><a href="#/vision/object_detector" class="nav-button" data-task="object-detection">Object Detection</a></li>
38+
<li><a href="#/vision/object_detector" class="nav-button" data-task="object-detector">Object Detection</a></li>
3939
<li><a href="#/vision/pose_landmarker" class="nav-button" data-task="pose-landmarker">Pose Landmarker</a></li>
4040
</ul>
4141
@@ -47,8 +47,8 @@ export function renderSidebar(container: HTMLElement) {
4747
<div class="category-header">Text</div>
4848
<ul>
4949
<li><a href="#/text/language_detector" class="nav-button" data-task="language-detector">Language Detection</a></li>
50-
<li><a href="#/text/text_classifier" class="nav-button" data-task="text-classification">Text Classification</a></li>
51-
<li><a href="#/text/text_embedder" class="nav-button" data-task="text-embedding">Text Embedding</a></li>
50+
<li><a href="#/text/text_classifier" class="nav-button" data-task="text-classifier">Text Classification</a></li>
51+
<li><a href="#/text/text_embedder" class="nav-button" data-task="text-embedder">Text Embedding</a></li>
5252
</ul>
5353
</nav>
5454
`;

0 commit comments

Comments
 (0)