c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-28 22:51:59 +00:00
Code Releases Activity

Fixed incorrect microservices URLs after updating dockerfiles (#159)

Browse source
This commit is contained in:
Alex 2022-05-11 06:18:11 -05:00 committed by GitHub
parent bb89fa4aab
commit c5adbea6e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
microservices/src/image-classifier/image-classifier.controller.ts
View file

@ -5,7 +5,7 @@ import { ImageClassifierService } from './image-classifier.service';
export class ImageClassifierController {
constructor(
private readonly imageClassifierService: ImageClassifierService,
) {}
) { }
@Post('/tagImage')
async tagImage(@Body('thumbnailPath') thumbnailPath: string) {

3
microservices/src/object-detection/object-detection.controller.ts
View file

@ -1,11 +1,12 @@
import { Body, Controller, Post } from '@nestjs/common';
import { ObjectDetectionService } from './object-detection.service';
import { Logger } from '@nestjs/common';
@Controller('object-detection')
export class ObjectDetectionController {
constructor(
private readonly objectDetectionService: ObjectDetectionService,
) {}
) { }
@Post('/detectObject')
async detectObject(@Body('thumbnailPath') thumbnailPath: string) {

29
server/src/modules/background-task/background-task.processor.ts
View file

@ -115,7 +115,7 @@ export class BackgroundTaskProcessor {
async tagImage(job) {
const { thumbnailPath, asset }: { thumbnailPath: string; asset: AssetEntity } = job.data;
const res = await axios.post('http://immich_microservices:3001/image-classifier/tagImage', {
const res = await axios.post('http://immich-microservices:3001/image-classifier/tagImage', {
thumbnailPath: thumbnailPath,
});
@ -132,19 +132,24 @@ export class BackgroundTaskProcessor {
@Process('detect-object')
async detectObject(job) {
const { thumbnailPath, asset }: { thumbnailPath: string; asset: AssetEntity } = job.data;
try {
const { thumbnailPath, asset }: { thumbnailPath: string; asset: AssetEntity } = job.data;
const res = await axios.post('http://immich_microservices:3001/object-detection/detectObject', {
thumbnailPath: thumbnailPath,
});
if (res.status == 201 && res.data.length > 0) {
const smartInfo = new SmartInfoEntity();
smartInfo.assetId = asset.id;
smartInfo.objects = [...res.data];
await this.smartInfoRepository.upsert(smartInfo, {
conflictPaths: ['assetId'],
const res = await axios.post('http://immich-microservices:3001/object-detection/detectObject', {
thumbnailPath: thumbnailPath,
});
if (res.status == 201 && res.data.length > 0) {
const smartInfo = new SmartInfoEntity();
smartInfo.assetId = asset.id;
smartInfo.objects = [...res.data];
await this.smartInfoRepository.upsert(smartInfo, {
conflictPaths: ['assetId'],
});
}
} catch (error) {
Logger.error(`Failed to trigger object detection pipe line ${error.toString()}`)
}
}
}

2
server/src/modules/background-task/background-task.service.ts
View file

@ -9,7 +9,7 @@ export class BackgroundTaskService {
constructor(
@InjectQueue('background-task')
private backgroundTaskQueue: Queue,
) {}
) { }
async extractExif(savedAsset: AssetEntity, fileName: string, fileSize: number) {
await this.backgroundTaskQueue.add(