update deps
qwertyforce
parent
51383f783c
commit
5404ad3687
|
|
@ -1,5 +1,5 @@
|
|||
export default {
|
||||
server_port:"44444",
|
||||
server_port:44444,
|
||||
local_features_microservice_url:"http://127.0.0.1:33333",
|
||||
global_features_microservice_url:"http://127.0.0.1:33334",
|
||||
color_microservice_url:"http://127.0.0.1:33335",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
18
package.json
18
package.json
|
|
@ -19,17 +19,17 @@
|
|||
},
|
||||
"homepage": "https://github.com/qwertyforce/ambience#readme",
|
||||
"dependencies": {
|
||||
"@fastify/cors": "^8.0.0",
|
||||
"@fastify/formbody": "^7.0.1",
|
||||
"@fastify/multipart": "^7.1.0",
|
||||
"@fastify/reply-from": "^8.1.0",
|
||||
"@types/multiparty": "^0.0.33",
|
||||
"@types/node": "^15.3.0",
|
||||
"axios": "^0.21.1",
|
||||
"@types/node": "^18.0.5",
|
||||
"axios": "^0.27.2",
|
||||
"cross-env": "^7.0.3",
|
||||
"fastify": "^3.20.1",
|
||||
"fastify-formbody": "^5.1.0",
|
||||
"fastify-multipart": "^4.0.7",
|
||||
"fastify-reply-from": "^6.0.1",
|
||||
"fastify": "^4.2.1",
|
||||
"form-data": "^4.0.0",
|
||||
"json-schema-to-ts": "^1.6.4",
|
||||
"multiparty": "^4.2.3",
|
||||
"typescript": "^4.6.4"
|
||||
"json-schema-to-ts": "^2.5.4",
|
||||
"typescript": "^4.7.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import config from "../../config/config"
|
|||
import FormData from 'form-data'
|
||||
import axios from 'axios'
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
async function calculate_phash_features(image_id: number, image: Buffer) {
|
||||
const form = new FormData()
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
import config from './../config/config'
|
||||
import fastifyMultipart from 'fastify-multipart'
|
||||
import fastifyMultipart from '@fastify/multipart'
|
||||
import fastify from 'fastify'
|
||||
import formBodyPlugin from 'fastify-formbody'
|
||||
import fastifyReplyFrom from 'fastify-reply-from'
|
||||
// import fastifyCors from '@fastify/cors'
|
||||
import formBodyPlugin from '@fastify/formbody'
|
||||
import fastifyReplyFrom from '@fastify/reply-from'
|
||||
import fastifyCors from '@fastify/cors'
|
||||
// import multiparty from 'multiparty'
|
||||
const server = fastify({logger:false})
|
||||
const server = fastify({logger:true})
|
||||
|
||||
// server.addHook('preHandler', function (req, _reply, done) {
|
||||
// var form = new multiparty.Form({autoFiles:true,uploadDir:"./uploads/"})
|
||||
|
|
@ -13,10 +13,10 @@ const server = fastify({logger:false})
|
|||
// done()
|
||||
// })
|
||||
|
||||
// server.register(fastifyCors, {
|
||||
// "origin": "*",
|
||||
// "methods": "GET,HEAD,PUT,PATCH,POST,DELETE",
|
||||
// })
|
||||
server.register(fastifyCors, {
|
||||
"origin": "*",
|
||||
"methods": "GET,HEAD,PUT,PATCH,POST,DELETE",
|
||||
})
|
||||
const port = config.server_port
|
||||
|
||||
function combineURLs(baseURL: string, relativeURL: string) { //https://stackoverflow.com/a/49966753
|
||||
|
|
@ -33,7 +33,6 @@ server.register(async function (app) {
|
|||
app.register(formBodyPlugin)
|
||||
app.register(fastifyMultipart, {
|
||||
attachFieldsToBody: true,
|
||||
sharedSchemaId: '#mySharedSchema',
|
||||
limits: {
|
||||
fieldNameSize: 100, // Max field name size in bytes
|
||||
fieldSize: 1000, // Max field value size in bytes
|
||||
|
|
@ -53,8 +52,9 @@ server.register(fastifyReplyFrom,{http: {agentOptions: {keepAliveMsecs: 10 * 60
|
|||
server.addContentTypeParser('multipart/form-data', function (_request, payload, done) {
|
||||
done(null, payload) //https://github.com/fastify/help/issues/67
|
||||
})
|
||||
|
||||
const local_features_routes = ['/local_features_get_similar_images_by_image_buffer','/local_features_get_similar_images_by_id', '/calculate_local_features', '/delete_local_features']
|
||||
local_features_routes.forEach((r) => server.post(r, async (_req, res) => {
|
||||
local_features_routes.forEach((r) => server.post(r, (_req, res) => {
|
||||
try {
|
||||
res.from(combineURLs(config.local_features_microservice_url, r))
|
||||
} catch (err) {
|
||||
|
|
@ -64,7 +64,7 @@ local_features_routes.forEach((r) => server.post(r, async (_req, res) => {
|
|||
}))
|
||||
|
||||
const global_features_routes = ['/global_features_get_similar_images_by_image_buffer', '/global_features_get_similar_images_by_id', '/calculate_global_features', '/delete_global_features']
|
||||
global_features_routes.forEach((r) => server.post(r, async (_req, res) => {
|
||||
global_features_routes.forEach((r) => server.post(r, (_req, res) => {
|
||||
try {
|
||||
res.from(combineURLs(config.global_features_microservice_url, r))
|
||||
} catch (err) {
|
||||
|
|
@ -74,7 +74,7 @@ global_features_routes.forEach((r) => server.post(r, async (_req, res) => {
|
|||
}))
|
||||
|
||||
const color_routes = ['/color_get_similar_images_by_image_buffer', '/color_get_similar_images_by_id', '/calculate_color_features', '/delete_color_features']
|
||||
color_routes.forEach((r) => server.post(r, async (_req, res) => {
|
||||
color_routes.forEach((r) => server.post(r, (_req, res) => {
|
||||
try {
|
||||
res.from(combineURLs(config.color_microservice_url, r))
|
||||
} catch (err) {
|
||||
|
|
@ -84,7 +84,7 @@ color_routes.forEach((r) => server.post(r, async (_req, res) => {
|
|||
}))
|
||||
|
||||
const text_routes = ['/text_get_similar_images_by_image_buffer', '/text_get_similar_images_by_id', '/calculate_text_features', '/delete_text_features']
|
||||
text_routes.forEach((r) => server.post(r, async (_req, res) => {
|
||||
text_routes.forEach((r) => server.post(r, (_req, res) => {
|
||||
try {
|
||||
res.from(combineURLs(config.text_microservice_url, r))
|
||||
} catch (err) {
|
||||
|
|
@ -94,7 +94,7 @@ text_routes.forEach((r) => server.post(r, async (_req, res) => {
|
|||
}))
|
||||
|
||||
const phash_routes = ['/phash_get_similar_images_by_image_buffer', '/calculate_phash_features', '/delete_phash_features']
|
||||
phash_routes.forEach((r) => server.post(r, async (_req, res) => {
|
||||
phash_routes.forEach((r) => server.post(r, (_req, res) => {
|
||||
try {
|
||||
res.from(combineURLs(config.phash_microservice_url, r))
|
||||
} catch (err) {
|
||||
|
|
@ -104,7 +104,7 @@ phash_routes.forEach((r) => server.post(r, async (_req, res) => {
|
|||
}))
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
server.listen(port, "127.0.0.1", function (err, address) {
|
||||
server.listen({port:port, host:"127.0.0.1"}, function (err, address) {
|
||||
if (err) {
|
||||
console.error(err)
|
||||
process.exit(1)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,19 @@
|
|||
import { FastifyRequest, FastifyReply } from "fastify"
|
||||
import { FastifyRequest, FastifyReply } from "fastify"
|
||||
import { FromSchema } from "json-schema-to-ts";
|
||||
import image_ops from "./../helpers/image_ops"
|
||||
const body_schema_calculate_all_image_features = {
|
||||
type: 'object',
|
||||
properties: {
|
||||
image: { $ref: '#mySharedSchema' },
|
||||
image: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
encoding: { type: 'string' },
|
||||
filename: { type: 'string' },
|
||||
limit: { type: 'boolean' },
|
||||
mimetype: { type: 'string' }
|
||||
}
|
||||
},
|
||||
name: { type: 'string' },
|
||||
image_id: {
|
||||
type: "object",
|
||||
properties: {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,15 @@ import image_ops from "./../helpers/image_ops"
|
|||
const body_schema_reverse_search = {
|
||||
type: 'object',
|
||||
properties: {
|
||||
image: { $ref: '#mySharedSchema' },
|
||||
image: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
encoding: { type: 'string' },
|
||||
filename: { type: 'string' },
|
||||
limit: { type: 'boolean' },
|
||||
mimetype: { type: 'string' }
|
||||
}
|
||||
}
|
||||
},
|
||||
required: ['image'],
|
||||
} as const;
|
||||
|
|
|
|||
Loading…
Reference in New Issue