Publisher task

app_urls/fetcher/views.py

@@ -2,34 +2,16 @@ from .views_base import link_list, logs, log_db, trigger_task
 
 from django.core.paginator import Paginator
 from django.shortcuts import render, get_object_or_404
-from django.http import StreamingHttpResponse, JsonResponse
+from django.http import StreamingHttpResponse, JsonResponse, HttpResponse
 from django.db.models import Q, Count
 from django.utils import timezone
 from django.utils.timezone import now, timedelta
 from .models import Urls, Source, Search, UrlContent, UrlsSourceSearch, UrlsDuplicate
-import ollama
-import os
+from .src.llm import OllamaClient
 import json
 
 
 ####################################################################################################
-class OllamaClient():
-    def __init__(self):
-        self.client = ollama.Client(host=os.getenv("ENDPOINT_OLLAMA", "https://ollamamodel.matitos.org"))
-    
-    def _get_default_model(self):
-        return "llama3.2:3b"
-
-    def get_models(self):
-        models = sorted([m.model for m in self.client.list().models])
-        if (self._get_default_model() in models):
-            return [self._get_default_model()] + [m for m in models if m != self._get_default_model()]
-        else:
-            return models
-    
-    def get_prompt(self):
-        return "Rewrite the text below into a clear and concise summary, presenting the key points as if they are newly written insights. Do not mention or reference the original text, its source, or any phrases like 'According to' or 'The text states'. Instead, write in a natural, standalone format that feels like an original explanation. Keep it brief, engaging, informative, in the style of a news article, and no longer than a paragraph:"
-
 
 def llm(request):
 
@@ -72,7 +54,6 @@ def url_detail_view(request, id):
     except UrlContent.DoesNotExist:
         url_content = {}
     
-    # TODO: https://github.com/ollama/ollama-python?tab=readme-ov-file#async-client
     ollama = OllamaClient()
 
     context = {
@@ -301,15 +282,5 @@ def filtered_urls(request):
     }
 
     return render(request, 'filtered_urls.html', context)
-####################################################################################################
-
-def content_generation(request):
-    '''
-    # Get list of URLs ID
-    selected_urls = request.GET.getlist('urls', [])
-    
-    # Sample URLs
-    selected_urls = [13460, 13455, 13454, 13452, 13210]
-    '''
 
 ####################################################################################################