Merge pull request #13 from eduranm/form_markapi

Modelos para datos de referencias

Author: robertatakenaka

config/settings/base.py

@@ -45,6 +45,7 @@
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
     'wagtail.contrib.settings',
+    "wagtail_modeladmin",
     "wagtail.embeds",
     "wagtail.sites",
     "wagtail.users",
@@ -65,6 +66,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "django_celery_results"
 ]
 
 THIRD_PARTY_APPS = [
@@ -78,6 +80,7 @@
     "core_settings",
     "django_celery_beat",
     "tracker",
+    "reference"
 ]
 
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS + WAGTAIL

core/forms.py

@@ -0,0 +1,15 @@
+from wagtail.admin.forms import WagtailAdminModelForm
+
+
+class CoreAdminModelForm(WagtailAdminModelForm):
+    def save_all(self, user):
+        model_with_creator = super().save(commit=False)
+
+        if self.instance.pk is not None:
+            model_with_creator.updated_by = user
+        else:
+            model_with_creator.creator = user
+
+        self.save()
+
+        return model_with_creator

llama3/download_model.py

@@ -5,8 +5,10 @@
 
 login(token=HF_TOKEN)
 
+LLAMA_MODEL_DIR = "llama3/llama-3.2"
+MODEL_LLAMA = "llama-3.2-3b-instruct-q4_k_m.gguf"
 repo_id = 'hugging-quants/Llama-3.2-3B-Instruct-Q4_K_M-GGUF'
-filename = 'llama-3.2-3b-instruct-q4_k_m.gguf'
-local_dir = 'llama-3.2'
+filename = MODEL_LLAMA
+local_dir = LLAMA_MODEL_DIR
 
 downloaded_file = hf_hub_download(repo_id=repo_id, filename=filename, local_dir=local_dir)

llama3/generic_llama.py

@@ -5,18 +5,18 @@
 
 class GenericLlama:
 
-    def __init__(self, messages, response_format, max_tokens=20000, temperature=0.5, top_p=0.5):
-       self. llm = Llama(model_path = os.path.join(LLAMA_MODEL_DIR, MODEL_LLAMA))
-       self. messages = messages
-       self.response_format = response_format
-       self.max_tokens = max_tokens
-       self.temperature = temperature
-       self.top_p = top_p
+  def __init__(self, messages, response_format, max_tokens=4000, temperature=0.5, top_p=0.5): 
+    self. llm = Llama(model_path = os.path.join(LLAMA_MODEL_DIR, MODEL_LLAMA), n_ctx=4000)
+    self. messages = messages
+    self.response_format = response_format
+    self.max_tokens = max_tokens
+    self.temperature = temperature
+    self.top_p = top_p
 
-     def run(self, user_input):
-          input = self.messages.copy()
-          input.append({
-            'role': 'user',
-            'content': user_input
-          })
-          return self.llm.create_chat_completion(messages=input, response_format=self.response_format, max_tokens=self.max_tokens, temperature=self.temperature, top_p=self.top_p)
+  def run(self, user_input):
+    input = self.messages.copy()
+    input.append({
+      'role': 'user',
+      'content': user_input
+    })
+    return self.llm.create_chat_completion(messages=input, response_format=self.response_format, max_tokens=self.max_tokens, temperature=self.temperature, top_p=self.top_p)

reference/__init__.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

reference/admin.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ReferenceConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'reference'

reference/apps.py

@@ -1,6 +1,6 @@
 from llama3.generic_llama import GenericLlama
 
-from reference.config import MESSAGE, RESPONSE_FORMAT
+from reference.config import MESSAGES, RESPONSE_FORMAT
 
 
 reference_marker = GenericLlama(MESSAGES, RESPONSE_FORMAT)

reference/marker.py

@@ -0,0 +1,48 @@
+# Generated by Django 5.0.8 on 2025-02-05 08:54
+
+import django.core.validators
+import django.db.models.deletion
+import modelcluster.fields
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Reference',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True, verbose_name='Creation date')),
+                ('updated', models.DateTimeField(auto_now=True, verbose_name='Last update date')),
+                ('mixed_citation', models.TextField(blank=True, verbose_name='Mixed Citation')),
+                ('estatus', models.IntegerField(default=0)),
+                ('creator', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_creator', to=settings.AUTH_USER_MODEL, verbose_name='Creator')),
+                ('updated_by', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_last_mod_user', to=settings.AUTH_USER_MODEL, verbose_name='Updater')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ElementCitation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort_order', models.IntegerField(blank=True, editable=False, null=True)),
+                ('marked', models.JSONField(blank=True, default=dict, verbose_name='Marked')),
+                ('score', models.IntegerField(blank=True, help_text='Puntuación del 1 al 10', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(10)])),
+                ('reference', modelcluster.fields.ParentalKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='element_citation', to='reference.reference')),
+            ],
+            options={
+                'ordering': ['sort_order'],
+                'abstract': False,
+            },
+        ),
+    ]