From abc8a4280eabe7c7ae2aa61b638095b6825da45b Mon Sep 17 00:00:00 2001 From: Gary H <26419401+Gary-H9@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:30:43 +0100 Subject: [PATCH] :rocket: Initialise project --- .gitignore | 9 ++ manage.py | 22 +++ ollamate/__init__.py | 0 ollamate/asgi.py | 16 +++ ollamate/settings.py | 124 ++++++++++++++++ ollamate/urls.py | 23 +++ ollamate/wsgi.py | 16 +++ streamingapp/__init__.py | 0 streamingapp/admin.py | 3 + streamingapp/apps.py | 6 + streamingapp/migrations/__init__.py | 0 streamingapp/models.py | 3 + .../templates/streamingapp/input_form.html | 132 ++++++++++++++++++ streamingapp/tests.py | 3 + streamingapp/urls.py | 6 + streamingapp/views.py | 36 +++++ 16 files changed, 399 insertions(+) create mode 100755 manage.py create mode 100644 ollamate/__init__.py create mode 100644 ollamate/asgi.py create mode 100644 ollamate/settings.py create mode 100644 ollamate/urls.py create mode 100644 ollamate/wsgi.py create mode 100644 streamingapp/__init__.py create mode 100644 streamingapp/admin.py create mode 100644 streamingapp/apps.py create mode 100644 streamingapp/migrations/__init__.py create mode 100644 streamingapp/models.py create mode 100644 streamingapp/templates/streamingapp/input_form.html create mode 100644 streamingapp/tests.py create mode 100644 streamingapp/urls.py create mode 100644 streamingapp/views.py diff --git a/.gitignore b/.gitignore index aa69ef3..0762719 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,12 @@ env/ *.code-workspace *.sha256 terraform.tfstate +super-linter.log +.mypy_cache/ +.idea/ +__pycache__ +*.egg-info/ +node_modules/ +/static/ +/run/ +db.sqlite3 \ No newline at end of file diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..9191747 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ollamate.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/ollamate/__init__.py b/ollamate/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ollamate/asgi.py b/ollamate/asgi.py new file mode 100644 index 0000000..0dcb726 --- /dev/null +++ b/ollamate/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for ollamate project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ollamate.settings') + +application = get_asgi_application() diff --git a/ollamate/settings.py b/ollamate/settings.py new file mode 100644 index 0000000..fbf6a87 --- /dev/null +++ b/ollamate/settings.py @@ -0,0 +1,124 @@ +""" +Django settings for ollamate project. + +Generated by 'django-admin startproject' using Django 5.0.6. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/5.0/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-(y%c-1p0lnlrxg!$3w)ptcyp=wzer(biav_-%_fehgn1oatx8p' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'streamingapp' +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'ollamate.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'ollamate.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/5.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/5.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/5.0/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/ollamate/urls.py b/ollamate/urls.py new file mode 100644 index 0000000..e78bb25 --- /dev/null +++ b/ollamate/urls.py @@ -0,0 +1,23 @@ +""" +URL configuration for ollamate project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/5.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path, include + +urlpatterns = [ + path('admin/', admin.site.urls), + path('stream/', include('streamingapp.urls')) +] diff --git a/ollamate/wsgi.py b/ollamate/wsgi.py new file mode 100644 index 0000000..a07ca1e --- /dev/null +++ b/ollamate/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for ollamate project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ollamate.settings') + +application = get_wsgi_application() diff --git a/streamingapp/__init__.py b/streamingapp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/streamingapp/admin.py b/streamingapp/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/streamingapp/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/streamingapp/apps.py b/streamingapp/apps.py new file mode 100644 index 0000000..02796ae --- /dev/null +++ b/streamingapp/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class StreamingappConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'streamingapp' diff --git a/streamingapp/migrations/__init__.py b/streamingapp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/streamingapp/models.py b/streamingapp/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/streamingapp/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/streamingapp/templates/streamingapp/input_form.html b/streamingapp/templates/streamingapp/input_form.html new file mode 100644 index 0000000..841b007 --- /dev/null +++ b/streamingapp/templates/streamingapp/input_form.html @@ -0,0 +1,132 @@ + + + + + Ollamate 🦙🍵 + + + + + + + +
+

A Proof of Concept by the Analytical Platform

+
+ + +
+

Ollamate 🦙🍵

+

A Simple Conversational AI.

+

Enter text below to interact with Ollamate:

+ +
+
+ + +
+
+
+ + + + + + diff --git a/streamingapp/tests.py b/streamingapp/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/streamingapp/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/streamingapp/urls.py b/streamingapp/urls.py new file mode 100644 index 0000000..1d03544 --- /dev/null +++ b/streamingapp/urls.py @@ -0,0 +1,6 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path('call-ollama/', views.call_ollama, name='call_ollama'), +] diff --git a/streamingapp/views.py b/streamingapp/views.py new file mode 100644 index 0000000..2ebde88 --- /dev/null +++ b/streamingapp/views.py @@ -0,0 +1,36 @@ +from django.shortcuts import render +from django.http import JsonResponse +import requests +import logging +import json + +# Configure logging +logging.basicConfig(level=logging.DEBUG) + +def call_ollama(request): + if request.method == 'POST': + user_input = request.POST.get('userInput', '') + conversation_history = json.loads(user_input) + url = 'http://localhost:11434/api/chat' + headers = {'Content-Type': 'application/json'} + data = { + "model": "llama3", + "messages": conversation_history, + "stream": False + } + logging.debug("Sending data to Ollama API: %s", json.dumps(data, indent=2)) + try: + response = requests.post(url, json=data, headers=headers) + response.raise_for_status() + response_data = response.json() + logging.debug("Response data: %s", json.dumps(response_data, indent=2)) + # Extract the actual response message + ollama_response = response_data.get("message", {}).get("content", "") + if not ollama_response: + logging.error("Empty response from Ollama API") + return JsonResponse({"response": ollama_response}) + except requests.RequestException as e: + logging.error("RequestException: %s", e) + return JsonResponse({"error": str(e)}, status=500) + else: + return render(request, 'streamingapp/input_form.html')