Skip to content

Commit

Permalink
chore: かろうじて動く状態まで制限
Browse files Browse the repository at this point in the history
  • Loading branch information
takeYY committed Jul 27, 2023
1 parent e2b6773 commit f2ed168
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 29 deletions.
24 changes: 12 additions & 12 deletions api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM python:3.10

# Jumanpp の導入
RUN wget https://github.com/ku-nlp/jumanpp/releases/download/v2.0.0-rc3/jumanpp-2.0.0-rc3.tar.xz \
&& apt-get update \
&& apt-get install -y sudo \
&& apt-get install -y make \
&& apt-get install -y cmake \
&& apt-get install -y tar \
&& tar xJvf jumanpp-2.0.0-rc3.tar.xz \
&& cd jumanpp-2.0.0-rc3/ \
&& mkdir bld \
&& cd bld \
&& cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
&& sudo make install
# RUN wget https://github.com/ku-nlp/jumanpp/releases/download/v2.0.0-rc3/jumanpp-2.0.0-rc3.tar.xz \
# && apt-get update \
# && apt-get install -y sudo \
# && apt-get install -y make \
# && apt-get install -y cmake \
# && apt-get install -y tar \
# && tar xJvf jumanpp-2.0.0-rc3.tar.xz \
# && cd jumanpp-2.0.0-rc3/ \
# && mkdir bld \
# && cd bld \
# && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
# && sudo make install

# 作業ディレクトリ
WORKDIR /api
Expand Down
10 changes: 6 additions & 4 deletions api/src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
from src.presentation import Container
from src.presentation.default.default_route import default_router
from src.presentation.film_record.command.film_record_command_route import film_record_command_router
from src.presentation.film_record.query.film_record_query_route import film_record_query_router
from src.presentation.jumanpp.jumanpp_route import jumanpp_router

# from src.presentation.film_record.query.film_record_query_route import film_record_query_router

# from src.presentation.jumanpp.jumanpp_route import jumanpp_router

app = FastAPI(
title="Filmography API",
Expand All @@ -16,8 +18,8 @@
Container()

app.include_router(default_router, tags=["default"])
app.include_router(jumanpp_router, tags=["jumanpp"])
app.include_router(film_record_query_router, tags=["film_record"])
# app.include_router(jumanpp_router, tags=["jumanpp"])
# app.include_router(film_record_query_router, tags=["film_record"])
app.include_router(film_record_command_router, prefix="/film_record/command", tags=["film_record"])


Expand Down
24 changes: 14 additions & 10 deletions api/src/presentation/containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,30 @@

# 独自ライブラリ
from src.application.film_record.command.interface import IFilmRecordCommandApplication
from src.application.film_record.query.interface import IFilmRecordQueryApplication
from src.application.jumanpp.jumanpp_application import JumanppApplication
from src.presentation.film_record.command import FilmRecordCommandContainer
from src.presentation.film_record.query import FilmRecordQueryContainer
from src.presentation.jumanpp.jumanpp_container import JumanppContainer

# from src.application.film_record.query.interface import IFilmRecordQueryApplication
# from src.presentation.film_record.query import FilmRecordQueryContainer

# from src.application.jumanpp.jumanpp_application import JumanppApplication
# from src.presentation.jumanpp.jumanpp_container import JumanppContainer


class Container(containers.DeclarativeContainer):
wiring_config = containers.WiringConfiguration(
modules=[
".jumanpp.jumanpp_route",
".film_record.query.film_record_query_route",
# ".jumanpp.jumanpp_route",
# ".film_record.query.film_record_query_route",
".film_record.command.film_record_command_route",
]
)

jumanpp_application: Factory[JumanppApplication] = JumanppContainer.jumanpp_application
film_record_query_application: Factory[
IFilmRecordQueryApplication
] = FilmRecordQueryContainer.film_record_query_application
# jumanpp_application: Factory[JumanppApplication] = JumanppContainer.jumanpp_application

# film_record_query_application: Factory[
# IFilmRecordQueryApplication
# ] = FilmRecordQueryContainer.film_record_query_application

film_record_command_application: Factory[
IFilmRecordCommandApplication
] = FilmRecordCommandContainer.film_record_command_application
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import os

# 外部ライブラリ
from dependency_injector import providers
from dependency_injector.providers import Factory

# 独自ライブラリ
Expand All @@ -25,7 +24,7 @@ class FilmRecordQueryContainer:
film_record_query_application: Factory[IFilmRecordQueryApplication]

if env == "PROD":
film_record_query_application = providers.Factory(
film_record_query_application = Factory(
ImplFilmRecordQueryApplication,
film_record_repository=ImplFilmRecordRepository(),
film_genre_repository=ImplFilmGenreRepository(),
Expand All @@ -34,7 +33,7 @@ class FilmRecordQueryContainer:
watch_medium_repository=ImplWatchMediumRepository(),
)
else:
film_record_query_application = providers.Factory(
film_record_query_application = Factory(
ImplFilmRecordQueryApplication,
film_record_repository=ImplInmemoryFilmRecordRepository(),
film_genre_repository=ImplInmemoryFilmGenreRepository(),
Expand Down

0 comments on commit f2ed168

Please sign in to comment.