Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AWANLLM_API_KEY=1a528137-3f02-44ec-8b6f-bca3ac361736
10 changes: 9 additions & 1 deletion djangocrud/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
https://docs.djangoproject.com/en/4.0/ref/settings/
"""

from dotenv import load_dotenv
from pathlib import Path
import os

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
Expand Down Expand Up @@ -38,6 +40,7 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'git_version',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -79,7 +82,7 @@
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'tasksdb',
'USER': 'postgres',
'PASSWORD': 'password',
'PASSWORD': 'postgres',
'HOST': 'localhost',
'PORT': '5432',
}
Expand Down Expand Up @@ -122,7 +125,12 @@

STATIC_URL = 'static/'

LOGIN_URL = '/signin/'

# Default primary key field type
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

# Load environment variables from .env file
load_dotenv()
7 changes: 7 additions & 0 deletions djangocrud/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@
"""
from django.contrib import admin
from django.urls import path, include
from tasks import views

urlpatterns = [
path('admin/', admin.site.urls),
path('', views.home, name='index'),
path('tasks/', include('tasks.urls')),
# path('tasks/', tasks, name='tasks'),
path('signup/', views.signup, name='signup'),
path('signin/', views.signin, name='signin'),
path('signout/', views.signout, name='signout'),
path('base/', views.base, name='base'),
]
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ psycopg2==2.9.3
sqlparse==0.4.2
tomli==2.0.1
typing_extensions==4.2.0
python-dotenv==1.0.1

2 changes: 2 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
python manage.py runserver
6 changes: 6 additions & 0 deletions tasks/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
from django.contrib import admin
from .models import Task
from .models import Answer

class TaskAdmin(admin.ModelAdmin):
readonly_fields = ('created_at',)
# Register your models here.
admin.site.register(Task, TaskAdmin)
admin.site.register(Answer, TaskAdmin)
45 changes: 45 additions & 0 deletions tasks/ai_api.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import requests
import json
import os

# Replace with your actual API key
AWANLLM_API_KEY = os.getenv('AWANLLM_API_KEY')


# @app.route("/ask", methods=["POST"])
# def handle_request():
# user_input = request.form["user_input"]
# if user_input:
# response = send_request(user_input)
# api_response = process_response(response)
# return json.dumps({"response": api_response})
# else:
# return json.dumps({"error": "Please enter some text"})

def send_request(user_input):
url = "https://api.awanllm.com/v1/chat/completions"

payload = json.dumps({
"model": "Meta-Llama-3-8B-Instruct",
"messages": [
{
"role": "user",
"content": user_input
}
]
})

headers = {
'Content-Type': 'application/json',
'Authorization': f"Bearer {AWANLLM_API_KEY}"
}

response = requests.request("POST", url, headers=headers, data=payload)
# return response.json()
return response.json().get("choices")[0].get("message").get("content")


# def process_response(response):
# # Extract the API response from the JSON
# api_response = response.get("choices")[0].get("content")
# return api_response
2 changes: 2 additions & 0 deletions tasks/constants.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
default_engine = 'AWANLLM'
not_available = 'Not Available'
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Generated by Django 5.0.4 on 2024-05-06 14:58

import django.db.models.deletion
import django.utils.timezone
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

replaces = [('tasks', '0001_initial'), ('tasks', '0002_task_description_alter_task_title'), ('tasks', '0003_remove_task_description'), ('tasks', '0004_task_description'), ('tasks', '0005_remove_task_description'), ('tasks', '0006_task_description'), ('tasks', '0007_task_created_at_task_engine'), ('tasks', '0008_remove_task_description_task_created_user_and_more'), ('tasks', '0009_rename_created_user_task_created_by_user'), ('tasks', '0010_rename_title_task_input_value'), ('tasks', '0011_answer'), ('tasks', '0012_alter_answer_created_by_user_and_more'), ('tasks', '0013_remove_answer_created_by_user'), ('tasks', '0014_rename_created_by_user_task_created_by')]

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Task',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('input_value', models.CharField(max_length=100)),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('engine', models.CharField(default='AWANLLM', max_length=50)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Answer',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('answer_value', models.TextField()),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('engine', models.CharField(default='AWANLLM', max_length=50)),
('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tasks.task')),
],
),
]
24 changes: 24 additions & 0 deletions tasks/migrations/0007_task_created_at_task_engine.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 5.0.4 on 2024-04-24 20:02

import django.utils.timezone
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('tasks', '0006_task_description'),
]

operations = [
migrations.AddField(
model_name='task',
name='created_at',
field=models.DateTimeField(default=django.utils.timezone.now),
),
migrations.AddField(
model_name='task',
name='engine',
field=models.CharField(default='NONE', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated by Django 5.0.4 on 2024-04-24 20:18

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('tasks', '0007_task_created_at_task_engine'),
]

operations = [
migrations.RemoveField(
model_name='task',
name='description',
),
migrations.AddField(
model_name='task',
name='created_user',
field=models.CharField(default='DEFAULT_USER'),
),
migrations.AlterField(
model_name='task',
name='engine',
field=models.CharField(default='AWANLLM', max_length=50),
),
]
18 changes: 18 additions & 0 deletions tasks/migrations/0009_rename_created_user_task_created_by_user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-24 20:18

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('tasks', '0008_remove_task_description_task_created_user_and_more'),
]

operations = [
migrations.RenameField(
model_name='task',
old_name='created_user',
new_name='created_by_user',
),
]
18 changes: 18 additions & 0 deletions tasks/migrations/0010_rename_title_task_input_value.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-04-24 20:24

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('tasks', '0009_rename_created_user_task_created_by_user'),
]

operations = [
migrations.RenameField(
model_name='task',
old_name='title',
new_name='input_value',
),
]
26 changes: 26 additions & 0 deletions tasks/migrations/0011_answer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 5.0.4 on 2024-04-24 20:33

import django.db.models.deletion
import django.utils.timezone
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('tasks', '0010_rename_title_task_input_value'),
]

operations = [
migrations.CreateModel(
name='Answer',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('answer_value', models.TextField()),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('created_by_user', models.CharField(default='DEFAULT_USER')),
('engine', models.CharField(default='AWANLLM', max_length=50)),
('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tasks.task')),
],
),
]
26 changes: 26 additions & 0 deletions tasks/migrations/0012_alter_answer_created_by_user_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 5.0.4 on 2024-05-02 13:01

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('tasks', '0011_answer'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AlterField(
model_name='answer',
name='created_by_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='task',
name='created_by_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
17 changes: 17 additions & 0 deletions tasks/migrations/0013_remove_answer_created_by_user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 5.0.4 on 2024-05-02 13:14

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('tasks', '0012_alter_answer_created_by_user_and_more'),
]

operations = [
migrations.RemoveField(
model_name='answer',
name='created_by_user',
),
]
18 changes: 18 additions & 0 deletions tasks/migrations/0014_rename_created_by_user_task_created_by.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2024-05-02 13:27

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('tasks', '0013_remove_answer_created_by_user'),
]

operations = [
migrations.RenameField(
model_name='task',
old_name='created_by_user',
new_name='created_by',
),
]
30 changes: 28 additions & 2 deletions tasks/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
from django.db import models
from django.utils import timezone
from .constants import default_engine
from django.contrib.auth.models import User

# Create your models here.
class Task(models.Model):
title = models.CharField(max_length=100)
description = models.TextField(blank=True)
input_value = models.CharField(max_length=100)

# Timestamp field with default value of current time
created_at = models.DateTimeField(default=timezone.now)
created_by = models.ForeignKey(User, on_delete=models.CASCADE)
# String field for engine
engine = models.CharField(max_length=50, default=default_engine) # Adjust max_length as needed

def __str__(self):
formatted_date = self.created_at.strftime("%Y/%m/%d %H:%M:%S")
return f"{self.pk}, {self.input_value}, formatted_date, {self.created_by}, {self.engine}"
class Answer(models.Model):
answer_value = models.TextField(blank=False)

# Timestamp field with default value of current time
created_at = models.DateTimeField(default=timezone.now)
# created_by_user = models.ForeignKey(User, on_delete=models.CASCADE)
# String field for engine
engine = models.CharField(max_length=50, default=default_engine) # Adjust max_length as needed
# Foreign key to Task model
task = models.ForeignKey(Task, on_delete=models.CASCADE)

def __str__(self):
formatted_date = self.created_at.strftime("%Y/%m/%d %H:%M:%S")
return f"{self.pk}, {self.answer_value[:15]}..., {formatted_date}, {self.engine}, {self.task.id}"
7 changes: 7 additions & 0 deletions tasks/static/css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tasks/static/css/bootstrap.min.css.map

Large diffs are not rendered by default.

Loading