Merge pull request #1342 from watchdogpolska/develop

v1.2.5 - fixes and GH issues

.contrib/docker/Dockerfile.web

@@ -2,8 +2,6 @@
 ARG PYTHON_VERSION='3.10.6'
 FROM python:${PYTHON_VERSION}-slim
 RUN python --version
-RUN pip install --upgrade pip
-RUN pip --version
 RUN mkdir /code /code/production
 WORKDIR /code
 
@@ -20,6 +18,8 @@ RUN apt-get update \
    htop \
    gettext libgettextpo-dev wait-for-it \
 && rm -rf /var/lib/apt/lists/*
+RUN pip install --upgrade pip
+RUN pip --version
 COPY requirements/*.txt ./requirements/
 ARG DJANGO_VERSION='==3.2.20'
 # TODO: Move to /requirements/base.txt after fixing following bug:

.contrib/docker/Dockerfile.web.production

@@ -2,8 +2,6 @@
 ARG PYTHON_VERSION='3.10.6'
 FROM python:${PYTHON_VERSION}-slim
 RUN python --version
-RUN pip install --upgrade pip
-RUN pip --version
 RUN mkdir /code code/media code/staticfiles
 WORKDIR /code
 
@@ -20,6 +18,8 @@ RUN apt-get update \
    htop \
    gettext libgettextpo-dev wait-for-it \
 && rm -rf /var/lib/apt/lists/*
+RUN pip install --upgrade pip
+RUN pip --version
 COPY requirements/*.txt ./requirements/
 ARG DJANGO_VERSION='==3.2.20'
 # TODO: Move to /requirements/base.txt after fixing following bug:

.github/workflows/web_image_buil_and_push.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true && (github.ref == 'master' || github.ref == 'develop')
+    if: github.event.pull_request.merged == true && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.readthedocs.yml

@@ -9,6 +9,11 @@ sphinx:
   configuration: docs/conf.py
 formats: all
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
 python:
   install:
     - requirements: requirements/dev.txt

config/settings/common.py

@@ -412,6 +412,9 @@
 ELASTICSEARCH_URL = env("ELASTICSEARCH_URL", default=None)
 APACHE_TIKA_URL = env("APACHE_TIKA_URL", default="http://localhost:9998/tika")
 
+FILE_TO_TEXT_URL = env("FILE_TO_TEXT_URL", default="http://localhost:9980/")
+FILE_TO_TEXT_TOKEN = env("FILE_TO_TEXT_TOKEN", default="")
+
 ELASTICSEARCH_SHOW_SIMILAR = env("ELASTICSEARCH_SHOW_SIMILAR", default=False)
 
 # To avoid unwanted migrations when upgrading to Django 3.2
@@ -500,3 +503,11 @@
     "acronym": ["title"],
     "img": ["alt", "src", "title"],
 }
+
+OPENAI_API_KEY = env.str("OPENAI_API_KEY", "")
+OPENAI_LLM_MODEL = env.str("OPENAI_LLM_MODEL", "gpt-3.5-turbo")
+OPENAI_LLM_MODEL_MAX_TOKENS = env.int("OPENAI_LLM_MODEL_MAX_TOKENS", 4000)
+OPENAI_LLM_MODEL_LARGE = env.str("OPENAI_LLM_MODEL", "gpt-3.5-turbo-16k")
+OPENAI_LLM_MODEL_LARGE_MAX_TOKENS = env.int("OPENAI_LLM_MODEL_LARGE_MAX_TOKENS", 16000)
+OPENAI_LLM_TEMPERATURE = env.float("OPENAI_LLM_TEMPERATURE", 0.0)
+OPENAI_MAX_RETRIES = env.int("OPENAI_MAX_RETRIES", 5)

docker-compose.yml

@@ -56,6 +56,13 @@ services:
       ATTACHMENTSCANNER_API_KEY: ""
       ATTACHMENTSCANNER_API_URL: ""
       METADEFENDER_API_KEY: ${METADEFENDER_API_KEY}
+      FILE_TO_TEXT_URL: ${FILE_TO_TEXT_URL}
+      FILE_TO_TEXT_TOKEN: ${FILE_TO_TEXT_TOKEN}
+      OPENAI_API_KEY: ${OPENAI_API_KEY}
+      OPENAI_LLM_MODEL: ${OPENAI_LLM_MODEL}
+      OPENAI_LLM_MODEL_MAX_TOKENS: ${OPENAI_LLM_MODEL_MAX_TOKENS:-4000}
+      OPENAI_LLM_MODEL_LARGE: ${OPENAI_LLM_MODEL_LARGE}
+      OPENAI_LLM_MODEL_LARGE_MAX_TOKENS: ${OPENAI_LLM_MODEL_LARGE_MAX_TOKENS:-16000}
     ports:
       - "8000:8000"
     # Following allows to execute `docker attach feder_web_1`

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.1.27"
+__version__ = "1.2.5"
 
 
 # Compatibility to eg. django-rest-framework

feder/alerts/locale/pl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alerts 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-22 11:13+0000\n"
+"POT-Creation-Date: 2023-10-02 09:50+0000\n"
 "PO-Revision-Date: 2016-09-18 01:57+0200\n"
 "Last-Translator: Adam Dobrawy <[email protected]>\n"
 "Language-Team: pl_PL <[email protected]>\n"

feder/cases/admin.py

@@ -31,6 +31,15 @@ class CaseAdmin(VersionAdmin, GuardedModelAdmin):
         "email",
         "tags__name",
     ]
+    readonly_fields = [
+        "id",
+        "slug",
+        "first_request",
+        "last_request",
+        "monitoring",
+        "email",
+        "institution",
+    ]
     list_filter = [
         "confirmation_received",
         "response_received",

feder/cases/locale/pl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cases 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-22 11:13+0000\n"
-"PO-Revision-Date: 2023-06-15 14:07+0000\n"
+"POT-Creation-Date: 2023-10-02 09:50+0000\n"
+"PO-Revision-Date: 2023-08-22 10:20+0000\n"
 "Last-Translator:   <[email protected]>\n"
 "Language-Team: Adam Dobrawy <[email protected]>\n"
 "Language: pl_PL\n"
@@ -262,7 +262,11 @@ msgstr "Powiat"
 msgid "Voivodeship"
 msgstr "Województwo"
 
-#: feder/cases/viewsets.py:95
+#: feder/cases/viewsets.py:56
+msgid "URL"
+msgstr "URL"
+
+#: feder/cases/viewsets.py:96
 msgid "case_report"
 msgstr "raport_spraw"
 

feder/cases_tags/locale/pl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-22 11:13+0000\n"
+"POT-Creation-Date: 2023-10-02 09:50+0000\n"
 "PO-Revision-Date: 2021-01-29 01:44+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"

feder/domains/locale/pl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-22 11:13+0000\n"
+"POT-Creation-Date: 2023-10-02 09:50+0000\n"
 "PO-Revision-Date: 2023-05-16 13:12+0000\n"
 "Last-Translator:   <[email protected]>\n"
 "Language-Team: \n"

feder/institutions/locale/pl/LC_MESSAGES/django.po

@@ -7,37 +7,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-institutions 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-22 11:13+0000\n"
+"POT-Creation-Date: 2023-10-02 09:50+0000\n"
 "PO-Revision-Date: 2023-06-22 11:14+0000\n"
 "Last-Translator:   <[email protected]>\n"
 "Language-Team: Adam Dobrawy <[email protected]>\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 2.0.6\n"
 "X-Translated-Using: django-rosetta 0.9.9\n"
 
 #: feder/institutions/admin.py:30
-#| msgid "Institutions"
 msgid "Institution tags"
 msgstr "Tagi instytucji"
 
 #: feder/institutions/admin.py:34
 msgid "Teryt code"
 msgstr "Kod Teryt"
 
-#: feder/institutions/admin.py:38
-#| msgid "Parent institutions"
+#: feder/institutions/admin.py:38 feder/institutions/admin.py:44
 msgid "Mark selected institution as archival"
 msgstr "Oznacz wybraną instytucję jako archiwalną"
 
-#: feder/institutions/admin.py:44
+#: feder/institutions/admin.py:46 feder/institutions/admin.py:53
 msgid "Mark selected institution as NON archival"
 msgstr "Oznacz wybraną instytucję jako NIE archiwalną"
 
-#: feder/institutions/admin.py:64
+#: feder/institutions/admin.py:70
 msgid "Institution count"
 msgstr "Liczba instytucji"
 

feder/institutions/models.py

@@ -73,6 +73,10 @@ def __str__(self):
             return self.name + _(" (archival)")
         return self.name
 
+    @property
+    def name_with_jst(self):
+        return f"{self.name}; {self.jst.tree_name}"
+
     def get_absolute_url(self):
         return reverse("institutions:details", kwargs={"slug": self.slug})
 

feder/institutions/views.py

@@ -123,6 +123,9 @@ def get_queryset(self):
             qs = qs.filter(name__icontains=self.q)
         return qs.all().order_by("name")
 
+    def get_result_label(self, result):
+        return f"{result.name_with_jst}"
+
 
 class TagAutocomplete(autocomplete.Select2QuerySetView):
     def get_queryset(self):