Skip to content
Snippets Groups Projects
Commit c6214cd0 authored by Clemens Pohle's avatar Clemens Pohle
Browse files

Cleanup

parent 92f2a398
No related branches found
No related tags found
1 merge request!9Cleanup folder structure and improve environment usage and README
Showing
with 16 additions and 62 deletions
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
*.sqlite3
*.xml
*.iml
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class ArtguideApiConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'artguide_api'
from django.db import models
# Create your models here.
from django.test import TestCase
# Create your tests here.
from django.urls import path
from artguide_api.views import home, relay_query
urlpatterns = [
path("", home, name="home"),
path("api/", relay_query, name="relay")
]
from django.http import JsonResponse
from django.views.decorators.http import require_POST
# Create your views here.
def home(request) -> JsonResponse:
return JsonResponse({'message': 'Spargelguide'})
@require_POST
def relay_query(request) -> JsonResponse:
return JsonResponse({'message': 'Relay'})
FROM python:3
ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1
WORKDIR /src
COPY ../requirements.txt /src/
COPY ../manage.py /src/
RUN pip install -r requirements.txt
COPY . /src/
FROM python:3-alpine
ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1
COPY ./requirements.txt .
RUN pip install -r requirements.txt --no-cache-dir
COPY . .
ENTRYPOINT ["python3", "manage.py"]
CMD ["runserver", "0.0.0.0:8000"]
File moved
File moved
...@@ -11,6 +11,6 @@ import os ...@@ -11,6 +11,6 @@ import os
from django.core.asgi import get_asgi_application from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'artguide_backend.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'artguide.settings')
application = get_asgi_application() application = get_asgi_application()
File moved
...@@ -32,7 +32,6 @@ ALLOWED_HOSTS = ["*"] ...@@ -32,7 +32,6 @@ ALLOWED_HOSTS = ["*"]
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
'artguide_api.apps.ArtguideApiConfig',
'django.contrib.admin', 'django.contrib.admin',
'corsheaders', 'corsheaders',
'django.contrib.auth', 'django.contrib.auth',
...@@ -53,7 +52,7 @@ MIDDLEWARE = [ ...@@ -53,7 +52,7 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
] ]
ROOT_URLCONF = 'artguide_backend.urls' ROOT_URLCONF = 'artguide.urls'
TEMPLATES = [ TEMPLATES = [
{ {
...@@ -71,7 +70,7 @@ TEMPLATES = [ ...@@ -71,7 +70,7 @@ TEMPLATES = [
}, },
] ]
WSGI_APPLICATION = 'artguide_backend.wsgi.application' WSGI_APPLICATION = 'artguide.wsgi.application'
# Database # Database
......
File moved
...@@ -16,11 +16,10 @@ Including another URLconf ...@@ -16,11 +16,10 @@ Including another URLconf
from django.contrib import admin from django.contrib import admin
from django.urls import path, include from django.urls import path, include
from artguide_backend import sparql_views, ollama_views from artguide import sparql_views, ollama_views
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path("", include("artguide_api.urls")),
path('sparql/', sparql_views.sparql_query, name='sparql_query'), path('sparql/', sparql_views.sparql_query, name='sparql_query'),
path('ollama-query/', ollama_views.ollama_query, name='ollama_query'), path('ollama-query/', ollama_views.ollama_query, name='ollama_query'),
] ]
...@@ -10,6 +10,6 @@ https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ ...@@ -10,6 +10,6 @@ https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/
import os import os
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'artguide_backend.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'artguide.settings')
application = get_wsgi_application() application = get_wsgi_application()
...@@ -6,7 +6,7 @@ import sys ...@@ -6,7 +6,7 @@ import sys
def main(): def main():
"""Run administrative tasks.""" """Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'artguide_backend.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'artguide.settings')
try: try:
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
except ImportError as exc: except ImportError as exc:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment