feat: async dish recognition (Kafka/Watermill/SSE) + remove Wire + consolidate migrations
Async recognition pipeline:
- POST /ai/recognize-dish → 202 {job_id, queue_position, estimated_seconds}
- GET /ai/jobs/{id}/stream — SSE stream: queued → processing → done/failed
- Kafka topics: ai.recognize.paid (3 partitions) + ai.recognize.free (1 partition)
- 5-worker WorkerPool with priority loop (paid consumers first)
- SSEBroker via PostgreSQL LISTEN/NOTIFY
- Kafka adapter migrated from franz-go to Watermill (watermill-kafka/v2)
- Docker Compose: added Kafka + Zookeeper + kafka-init service
- Flutter: recognition_service.dart uses SSE; home_screen shows live job status
Remove google/wire (archived):
- Deleted wire.go (wireinject spec) and wire_gen.go
- Added cmd/server/init.go — plain Go manual DI, same initApp() logic
- Removed github.com/google/wire from go.mod
Consolidate migrations:
- Merged 001_initial_schema + 002_seed_data + 003_recognition_jobs into single 001_initial_schema.sql
- Deleted 002_seed_data.sql and 003_recognition_jobs.sql
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
dbastrikin
27
backend/cmd/server/app.go
Normal file
27
backend/cmd/server/app.go
Normal file
@@ -0,0 +1,27 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
|
||||
"github.com/food-ai/backend/internal/domain/recognition"
|
||||
)
|
||||
|
||||
// App bundles the HTTP handler with background services that need lifecycle management.
|
||||
type App struct {
|
||||
handler http.Handler
|
||||
workerPool *recognition.WorkerPool
|
||||
sseBroker *recognition.SSEBroker
|
||||
}
|
||||
|
||||
// ServeHTTP implements http.Handler.
|
||||
func (application *App) ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) {
|
||||
application.handler.ServeHTTP(responseWriter, request)
|
||||
}
|
||||
|
||||
// Start launches the SSE broker's LISTEN loop and the worker pool goroutines.
|
||||
// Call this once before the HTTP server begins accepting connections.
|
||||
func (application *App) Start(applicationContext context.Context) {
|
||||
application.sseBroker.Start(applicationContext)
|
||||
application.workerPool.Start(applicationContext)
|
||||
}
|
||||
@@ -1,15 +1,8 @@
|
||||
// Code generated by Wire. DO NOT EDIT.
|
||||
|
||||
//go:generate go run -mod=mod github.com/google/wire/cmd/wire
|
||||
//go:build !wireinject
|
||||
// +build !wireinject
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/food-ai/backend/internal/domain/auth"
|
||||
"github.com/food-ai/backend/internal/adapters/firebase"
|
||||
"github.com/food-ai/backend/internal/infra/config"
|
||||
"github.com/food-ai/backend/internal/domain/auth"
|
||||
"github.com/food-ai/backend/internal/domain/diary"
|
||||
"github.com/food-ai/backend/internal/domain/dish"
|
||||
"github.com/food-ai/backend/internal/domain/home"
|
||||
@@ -21,42 +14,60 @@ import (
|
||||
"github.com/food-ai/backend/internal/domain/recommendation"
|
||||
"github.com/food-ai/backend/internal/domain/savedrecipe"
|
||||
"github.com/food-ai/backend/internal/domain/user"
|
||||
"github.com/food-ai/backend/internal/infra/config"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// Injectors from wire.go:
|
||||
|
||||
func initRouter(appConfig *config.Config, pool *pgxpool.Pool) (http.Handler, error) {
|
||||
string2 := newFirebaseCredentialsFile(appConfig)
|
||||
tokenVerifier, err := firebase.NewAuthOrNoop(string2)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
func initApp(appConfig *config.Config, pool *pgxpool.Pool) (*App, error) {
|
||||
credentialsFile := newFirebaseCredentialsFile(appConfig)
|
||||
tokenVerifier, firebaseError := firebase.NewAuthOrNoop(credentialsFile)
|
||||
if firebaseError != nil {
|
||||
return nil, firebaseError
|
||||
}
|
||||
repository := user.NewRepository(pool)
|
||||
userRepository := user.NewRepository(pool)
|
||||
mainJwtSecret := newJWTSecret(appConfig)
|
||||
mainJwtAccessDuration := newJWTAccessDuration(appConfig)
|
||||
mainJwtRefreshDuration := newJWTRefreshDuration(appConfig)
|
||||
jwtManager := newJWTManager(mainJwtSecret, mainJwtAccessDuration, mainJwtRefreshDuration)
|
||||
service := auth.NewService(tokenVerifier, repository, jwtManager)
|
||||
handler := auth.NewHandler(service)
|
||||
userService := user.NewService(repository)
|
||||
authService := auth.NewService(tokenVerifier, userRepository, jwtManager)
|
||||
authHandler := auth.NewHandler(authService)
|
||||
userService := user.NewService(userRepository)
|
||||
userHandler := user.NewHandler(userService)
|
||||
mainGeminiAPIKey := newOpenAIAPIKey(appConfig)
|
||||
client := newOpenAIClient(mainGeminiAPIKey)
|
||||
openaiClient := newOpenAIClient(mainGeminiAPIKey)
|
||||
mainPexelsAPIKey := newPexelsAPIKey(appConfig)
|
||||
pexelsClient := newPexelsClient(mainPexelsAPIKey)
|
||||
productRepository := product.NewRepository(pool)
|
||||
recommendationHandler := recommendation.NewHandler(client, pexelsClient, repository, productRepository)
|
||||
recommendationHandler := recommendation.NewHandler(openaiClient, pexelsClient, userRepository, productRepository)
|
||||
dishRepository := dish.NewRepository(pool)
|
||||
savedrecipeRepository := savedrecipe.NewRepository(pool, dishRepository)
|
||||
savedrecipeHandler := savedrecipe.NewHandler(savedrecipeRepository)
|
||||
ingredientRepository := ingredient.NewRepository(pool)
|
||||
ingredientHandler := ingredient.NewHandler(ingredientRepository)
|
||||
productHandler := product.NewHandler(productRepository)
|
||||
recognitionHandler := recognition.NewHandler(client, ingredientRepository, dishRepository)
|
||||
|
||||
// Kafka producer and consumers
|
||||
kafkaProducer, kafkaProducerError := newKafkaProducer(appConfig)
|
||||
if kafkaProducerError != nil {
|
||||
return nil, kafkaProducerError
|
||||
}
|
||||
paidConsumer, paidConsumerError := newPaidKafkaConsumer(appConfig)
|
||||
if paidConsumerError != nil {
|
||||
return nil, paidConsumerError
|
||||
}
|
||||
freeConsumer, freeConsumerError := newFreeKafkaConsumer(appConfig)
|
||||
if freeConsumerError != nil {
|
||||
return nil, freeConsumerError
|
||||
}
|
||||
|
||||
// Recognition pipeline
|
||||
jobRepository := recognition.NewJobRepository(pool)
|
||||
sseBroker := recognition.NewSSEBroker(pool, jobRepository)
|
||||
workerPool := recognition.NewWorkerPool(jobRepository, openaiClient, dishRepository, paidConsumer, freeConsumer)
|
||||
recognitionHandler := recognition.NewHandler(openaiClient, ingredientRepository, jobRepository, kafkaProducer, sseBroker)
|
||||
|
||||
menuRepository := menu.NewRepository(pool)
|
||||
menuHandler := menu.NewHandler(menuRepository, client, pexelsClient, repository, productRepository, dishRepository)
|
||||
menuHandler := menu.NewHandler(menuRepository, openaiClient, pexelsClient, userRepository, productRepository, dishRepository)
|
||||
diaryRepository := diary.NewRepository(pool)
|
||||
diaryHandler := diary.NewHandler(diaryRepository, dishRepository, dishRepository)
|
||||
homeHandler := home.NewHandler(pool)
|
||||
@@ -64,11 +75,34 @@ func initRouter(appConfig *config.Config, pool *pgxpool.Pool) (http.Handler, err
|
||||
recipeRepository := recipe.NewRepository(pool)
|
||||
recipeHandler := recipe.NewHandler(recipeRepository)
|
||||
mainJwtAdapter := newJWTAdapter(jwtManager)
|
||||
v := newAuthMiddleware(mainJwtAdapter)
|
||||
authMiddlewareFn := newAuthMiddleware(mainJwtAdapter)
|
||||
mainAllowedOrigins := newAllowedOrigins(appConfig)
|
||||
mainUnitsListHandler := newUnitsListHandler(pool)
|
||||
mainCuisineListHandler := newCuisineListHandler(pool)
|
||||
mainTagListHandler := newTagListHandler(pool)
|
||||
httpHandler := newRouter(pool, handler, userHandler, recommendationHandler, savedrecipeHandler, ingredientHandler, productHandler, recognitionHandler, menuHandler, diaryHandler, homeHandler, dishHandler, recipeHandler, v, mainAllowedOrigins, mainUnitsListHandler, mainCuisineListHandler, mainTagListHandler)
|
||||
return httpHandler, nil
|
||||
httpHandler := newRouter(
|
||||
pool,
|
||||
authHandler,
|
||||
userHandler,
|
||||
recommendationHandler,
|
||||
savedrecipeHandler,
|
||||
ingredientHandler,
|
||||
productHandler,
|
||||
recognitionHandler,
|
||||
menuHandler,
|
||||
diaryHandler,
|
||||
homeHandler,
|
||||
dishHandler,
|
||||
recipeHandler,
|
||||
authMiddlewareFn,
|
||||
mainAllowedOrigins,
|
||||
mainUnitsListHandler,
|
||||
mainCuisineListHandler,
|
||||
mainTagListHandler,
|
||||
)
|
||||
return &App{
|
||||
handler: httpHandler,
|
||||
workerPool: workerPool,
|
||||
sseBroker: sseBroker,
|
||||
}, nil
|
||||
}
|
||||
@@ -48,14 +48,16 @@ func run() error {
|
||||
}
|
||||
slog.Info("languages loaded", "count", len(locale.Languages))
|
||||
|
||||
router, initError := initRouter(appConfig, pool)
|
||||
application, initError := initApp(appConfig, pool)
|
||||
if initError != nil {
|
||||
return fmt.Errorf("init router: %w", initError)
|
||||
return fmt.Errorf("init app: %w", initError)
|
||||
}
|
||||
|
||||
application.Start(applicationContext)
|
||||
|
||||
httpServer := &http.Server{
|
||||
Addr: fmt.Sprintf(":%d", appConfig.Port),
|
||||
Handler: router,
|
||||
Handler: application,
|
||||
ReadTimeout: 10 * time.Second,
|
||||
WriteTimeout: 120 * time.Second, // menu generation can take ~60s
|
||||
IdleTimeout: 60 * time.Second,
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"github.com/food-ai/backend/internal/infra/config"
|
||||
"github.com/food-ai/backend/internal/domain/diary"
|
||||
"github.com/food-ai/backend/internal/domain/dish"
|
||||
"github.com/food-ai/backend/internal/adapters/kafka"
|
||||
"github.com/food-ai/backend/internal/adapters/openai"
|
||||
"github.com/food-ai/backend/internal/domain/home"
|
||||
"github.com/food-ai/backend/internal/domain/ingredient"
|
||||
@@ -188,17 +189,35 @@ func newAuthMiddleware(validator middleware.AccessTokenValidator) func(http.Hand
|
||||
return middleware.Auth(validator)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Kafka providers
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
func newKafkaProducer(appConfig *config.Config) (*kafka.Producer, error) {
|
||||
return kafka.NewProducer(appConfig.KafkaBrokers)
|
||||
}
|
||||
|
||||
func newPaidKafkaConsumer(appConfig *config.Config) (*kafka.Consumer, error) {
|
||||
return kafka.NewConsumer(appConfig.KafkaBrokers, "dish-recognition-workers", recognition.TopicPaid)
|
||||
}
|
||||
|
||||
func newFreeKafkaConsumer(appConfig *config.Config) (*kafka.Consumer, error) {
|
||||
return kafka.NewConsumer(appConfig.KafkaBrokers, "dish-recognition-workers", recognition.TopicFree)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Interface assertions (compile-time checks)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
var _ middleware.AccessTokenValidator = (*jwtAdapter)(nil)
|
||||
var _ menu.PhotoSearcher = (*pexels.Client)(nil)
|
||||
var _ menu.UserLoader = (*user.Repository)(nil)
|
||||
var _ menu.ProductLister = (*product.Repository)(nil)
|
||||
var _ menu.RecipeSaver = (*dish.Repository)(nil)
|
||||
var _ recommendation.PhotoSearcher = (*pexels.Client)(nil)
|
||||
var _ recommendation.UserLoader = (*user.Repository)(nil)
|
||||
var _ recommendation.ProductLister = (*product.Repository)(nil)
|
||||
var _ middleware.AccessTokenValidator = (*jwtAdapter)(nil)
|
||||
var _ menu.PhotoSearcher = (*pexels.Client)(nil)
|
||||
var _ menu.UserLoader = (*user.Repository)(nil)
|
||||
var _ menu.ProductLister = (*product.Repository)(nil)
|
||||
var _ menu.RecipeSaver = (*dish.Repository)(nil)
|
||||
var _ recommendation.PhotoSearcher = (*pexels.Client)(nil)
|
||||
var _ recommendation.UserLoader = (*user.Repository)(nil)
|
||||
var _ recommendation.ProductLister = (*product.Repository)(nil)
|
||||
var _ recognition.IngredientRepository = (*ingredient.Repository)(nil)
|
||||
var _ user.UserRepository = (*user.Repository)(nil)
|
||||
var _ recognition.KafkaPublisher = (*kafka.Producer)(nil)
|
||||
var _ recognition.JobRepository = (*recognition.PostgresJobRepository)(nil)
|
||||
var _ user.UserRepository = (*user.Repository)(nil)
|
||||
|
||||
@@ -1,116 +0,0 @@
|
||||
//go:build wireinject
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/food-ai/backend/internal/domain/auth"
|
||||
"github.com/food-ai/backend/internal/adapters/firebase"
|
||||
"github.com/food-ai/backend/internal/infra/config"
|
||||
"github.com/food-ai/backend/internal/domain/diary"
|
||||
"github.com/food-ai/backend/internal/domain/dish"
|
||||
"github.com/food-ai/backend/internal/domain/home"
|
||||
"github.com/food-ai/backend/internal/domain/ingredient"
|
||||
"github.com/food-ai/backend/internal/domain/menu"
|
||||
"github.com/food-ai/backend/internal/infra/middleware"
|
||||
"github.com/food-ai/backend/internal/adapters/openai"
|
||||
"github.com/food-ai/backend/internal/adapters/pexels"
|
||||
"github.com/food-ai/backend/internal/domain/product"
|
||||
"github.com/food-ai/backend/internal/domain/recipe"
|
||||
"github.com/food-ai/backend/internal/domain/recognition"
|
||||
"github.com/food-ai/backend/internal/domain/recommendation"
|
||||
"github.com/food-ai/backend/internal/domain/savedrecipe"
|
||||
"github.com/food-ai/backend/internal/domain/user"
|
||||
"github.com/google/wire"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
func initRouter(appConfig *config.Config, pool *pgxpool.Pool) (http.Handler, error) {
|
||||
wire.Build(
|
||||
// Config extractors
|
||||
newOpenAIAPIKey,
|
||||
newPexelsAPIKey,
|
||||
newJWTSecret,
|
||||
newJWTAccessDuration,
|
||||
newJWTRefreshDuration,
|
||||
newAllowedOrigins,
|
||||
newFirebaseCredentialsFile,
|
||||
|
||||
// Auth
|
||||
firebase.NewAuthOrNoop,
|
||||
newJWTManager,
|
||||
newJWTAdapter,
|
||||
newAuthMiddleware,
|
||||
auth.NewService,
|
||||
auth.NewHandler,
|
||||
|
||||
// User
|
||||
user.NewRepository,
|
||||
user.NewService,
|
||||
user.NewHandler,
|
||||
|
||||
// External clients
|
||||
newOpenAIClient,
|
||||
newPexelsClient,
|
||||
|
||||
// Ingredient
|
||||
ingredient.NewRepository,
|
||||
ingredient.NewHandler,
|
||||
|
||||
// Product
|
||||
product.NewRepository,
|
||||
product.NewHandler,
|
||||
|
||||
// Dish
|
||||
dish.NewRepository,
|
||||
dish.NewHandler,
|
||||
|
||||
// Recipe
|
||||
recipe.NewRepository,
|
||||
recipe.NewHandler,
|
||||
|
||||
// Saved recipes
|
||||
savedrecipe.NewRepository,
|
||||
savedrecipe.NewHandler,
|
||||
|
||||
// Menu
|
||||
menu.NewRepository,
|
||||
menu.NewHandler,
|
||||
|
||||
// Diary
|
||||
diary.NewRepository,
|
||||
diary.NewHandler,
|
||||
|
||||
// Home
|
||||
home.NewHandler,
|
||||
|
||||
// Recognition & Recommendation
|
||||
recognition.NewHandler,
|
||||
recommendation.NewHandler,
|
||||
|
||||
// List handlers (DB-backed, injected into router)
|
||||
newUnitsListHandler,
|
||||
newCuisineListHandler,
|
||||
newTagListHandler,
|
||||
|
||||
// Router
|
||||
newRouter,
|
||||
|
||||
// Interface bindings
|
||||
wire.Bind(new(user.UserRepository), new(*user.Repository)),
|
||||
wire.Bind(new(menu.PhotoSearcher), new(*pexels.Client)),
|
||||
wire.Bind(new(menu.UserLoader), new(*user.Repository)),
|
||||
wire.Bind(new(menu.ProductLister), new(*product.Repository)),
|
||||
wire.Bind(new(menu.RecipeSaver), new(*dish.Repository)),
|
||||
wire.Bind(new(recommendation.PhotoSearcher), new(*pexels.Client)),
|
||||
wire.Bind(new(recommendation.UserLoader), new(*user.Repository)),
|
||||
wire.Bind(new(recommendation.ProductLister), new(*product.Repository)),
|
||||
wire.Bind(new(recognition.IngredientRepository), new(*ingredient.Repository)),
|
||||
wire.Bind(new(recognition.Recognizer), new(*openai.Client)),
|
||||
wire.Bind(new(menu.MenuGenerator), new(*openai.Client)),
|
||||
wire.Bind(new(recommendation.RecipeGenerator), new(*openai.Client)),
|
||||
wire.Bind(new(middleware.AccessTokenValidator), new(*jwtAdapter)),
|
||||
)
|
||||
return nil, nil
|
||||
}
|
||||
Reference in New Issue
Block a user