diff --git a/Makefile.local b/Makefile.local index cae4c18..b0cef4b 100644 --- a/Makefile.local +++ b/Makefile.local @@ -1,20 +1,20 @@ .PHONY: run-dev run-dev: - uvicorn swh.graphql.asgi:application --reload + uvicorn asgi:application --reload .PHONY: run-dev-stable run-dev-stable: - uvicorn swh.graphql.asgi:application + uvicorn asgi:application .PHONY: run-dev-docker run-dev-docker: docker-compose -f docker-compose.yml -f docker-compose-dev.yml up --build .PHONY: run-staging run-staging: docker-compose -f docker-compose.yml -f docker-compose-staging.yml up --build .PHONY: update-staging update-staging: git pull origin master docker-compose -f docker-compose.yml -f docker-compose-staging.yml restart diff --git a/swh/graphql/app.py b/app.py similarity index 92% copy from swh/graphql/app.py copy to app.py index ff3b455..878f63f 100644 --- a/swh/graphql/app.py +++ b/app.py @@ -1,27 +1,27 @@ from ariadne import gql, load_schema_from_path, make_executable_schema -from .resolvers import resolvers, scalars +from swh.graphql.resolvers import resolvers, scalars type_defs = gql(load_schema_from_path("swh/graphql/schema/schema.graphql")) schema = make_executable_schema( type_defs, resolvers.query, resolvers.origin, resolvers.visit, resolvers.visit_status, resolvers.snapshot, resolvers.snapshot_branch, resolvers.revision, resolvers.release, resolvers.directory, resolvers.directory_entry, resolvers.branch_target, resolvers.release_target, resolvers.directory_entry_target, scalars.id_scalar, scalars.string_scalar, scalars.datetime_scalar, scalars.swhid_scalar, scalars.hash_value_scalar, ) diff --git a/asgi.py b/asgi.py new file mode 100644 index 0000000..5953d08 --- /dev/null +++ b/asgi.py @@ -0,0 +1,5 @@ +from ariadne.asgi import GraphQL + +from app import schema + +application = GraphQL(schema, debug=True) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index f46311e..75eb76b 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,5 +1,5 @@ version: "3.4" services: app: - command: uvicorn swh.graphql.asgi:application --host 0.0.0.0 --port 8000 --reload + command: uvicorn asgi:application --host 0.0.0.0 --port 8000 --reload diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml index 99fde29..ef9f229 100644 --- a/docker-compose-staging.yml +++ b/docker-compose-staging.yml @@ -1,11 +1,11 @@ version: "3.4" services: app: dns: 192.168.100.29 environment: - RUNNING_ENV=staging - command: gunicorn --bind=0.0.0.0:8000 --workers=2 swh.graphql.wsgi:application + command: gunicorn --bind=0.0.0.0:8000 --workers=2 wsgi:application # haproxy: # command: uvicorn swh.graphql.app:app --host 0.0.0.0 --port 8000 diff --git a/swh/graphql/app.py b/swh/graphql/app.py index ff3b455..a7dbd95 100644 --- a/swh/graphql/app.py +++ b/swh/graphql/app.py @@ -1,27 +1,29 @@ from ariadne import gql, load_schema_from_path, make_executable_schema from .resolvers import resolvers, scalars -type_defs = gql(load_schema_from_path("swh/graphql/schema/schema.graphql")) +type_defs = gql( + load_schema_from_path("/src/swh-graphql/swh/graphql/schema/schema.graphql") +) schema = make_executable_schema( type_defs, resolvers.query, resolvers.origin, resolvers.visit, resolvers.visit_status, resolvers.snapshot, resolvers.snapshot_branch, resolvers.revision, resolvers.release, resolvers.directory, resolvers.directory_entry, resolvers.branch_target, resolvers.release_target, resolvers.directory_entry_target, scalars.id_scalar, scalars.string_scalar, scalars.datetime_scalar, scalars.swhid_scalar, scalars.hash_value_scalar, ) diff --git a/wsgi.py b/wsgi.py new file mode 100644 index 0000000..56affce --- /dev/null +++ b/wsgi.py @@ -0,0 +1,5 @@ +from ariadne.wsgi import GraphQL + +from app import schema + +application = GraphQL(schema)