Merge branch 'release/0.7.1'

UUDigitalHumanitieslab · Nov 14, 2023 · fcb2d94 · fcb2d94
2 parents 1b30fe6 + a55210a
commit fcb2d94
Show file tree

Hide file tree

Showing 11 changed files with 823 additions and 745 deletions.
diff --git a/backend/analysis/conftest.py b/backend/analysis/conftest.py
@@ -36,7 +36,13 @@ def stap_category(db):
 
 @pytest.fixture
 def asta_category(db):
-    obj = MethodCategory.objects.create(name='ASTA', zc_embeddings=False, levels=["SampleGrootte", "MLU", "Taalmaat", "Lemma", "Grammaticale fout", "QA"], marking_postcodes=["[+ G]"])
+    obj = MethodCategory.objects.create(name='ASTA', zc_embeddings=False, levels=[
+        "Samplegrootte",
+        "MLU",
+        "Taalmaat",
+        "Foutenanalyse",
+        "Lemma"
+    ], marking_postcodes=["[+ G]"])
     yield obj
     obj.delete()
 
@@ -59,7 +65,7 @@ def tarsp_method(db, tarsp_category, method_dir):
 
 @pytest.fixture
 def asta_method(db, asta_category, method_dir):
-    file = glob.glob(f'{method_dir}/ASTA Index Current.xlsx')[0]
+    file = glob.glob(f'{method_dir}/ASTA_Index_Current.xlsx')[0]
     with open(file, 'rb') as f:
         wrapped_file = File(f)
         instance = AssessmentMethod(name='asta_test_method', category=asta_category)

diff --git a/backend/analysis/fixtures/method_categories.json b/backend/analysis/fixtures/method_categories.json
@@ -14,7 +14,13 @@
         "fields": {
             "name": "ASTA",
             "zc_embeddings": false,
-            "levels": ["SampleGrootte", "MLU", "Taalmaat", "Lemma", "Grammaticale fout", "QA"],
+            "levels": [
+                "Samplegrootte",
+                "MLU",
+                "Taalmaat",
+                "Foutenanalyse",
+                "Lemma"
+            ],
             "marking_postcodes": ["[+ G]"]
         }
     },

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -210,7 +210,7 @@ requests==2.28.1
     #   spacy
 requests-oauthlib==1.3.1
     # via django-allauth
-sastadev==0.1.3
+sastadev==0.1.4
     # via
     #   -r requirements.in
     #   auchann

diff --git a/...lysis/annotations/test_files/sample_1.cha → backend/test_files/sample_1.cha b/...lysis/annotations/test_files/sample_1.cha → backend/test_files/sample_1.cha
diff --git a/...lysis/annotations/test_files/sample_1.xml → backend/test_files/sample_1.xml b/...lysis/annotations/test_files/sample_1.xml → backend/test_files/sample_1.xml
diff --git a/backend/test_files/sample_16.cha b/backend/test_files/sample_16.cha
@@ -37,11 +37,13 @@
 %xsid:	12
 *PMA:	en en toen ik zo ver weer was ben ik naar hier gekomen
 %xsid:	13
-*PMA:	dat heet de uh ZORGINSTELLING1
+*PMA:	dat heet de uh Rijnstate
 %xsid:	14
+%xano:	15|ZORGINSTELLING1|Rijnstate
 *INV:	ga ik nu een ander uh vraag stellen wat was uw beroep
-*PMA:	uh (..) BEROEP1
+*PMA:	uh (..) chirurgh
 %xsid:	15
+%xano:	8|BEROEP1|chirurgh
 *INV:	oke kunt u daar wat meer over vertellen
 *PMA:	ja is heel erg leuk ja
 %xsid:	16
@@ -81,8 +83,9 @@
 %xsid:	30
 *PMA:	uh kinderen met beperking
 %xsid:	31
-*PMA:	dat was dicht bij de WERKINSTELLING1
+*PMA:	dat was dicht bij de Rijnstate
 %xsid:	32
+%xano:	21|WERKINSTELLING1|Rijnstate
 *INV:	ja ja en dat was ook een dagopvang
 *PMA:	(.) ja (.) ja ik weet het niet
 %xsid:	33
@@ -97,8 +100,9 @@
 %xsid:	37
 *PMA:	dat heb ik net nog gelezen (..)
 %xsid:	38
-*PMA:	WERKINSTELLING2
+*PMA:	Vogellanden
 %xsid:	39
+%xano:	0|WERKINSTELLING2|Vogellanden
 *INV:	ja
 *PMA:	veel geweest voor uh
 %xsid:	40

diff --git a/backend/test_files/sample_16.xml b/backend/test_files/sample_16.xml
diff --git a/backend/test_files/sample_16_SAF.xlsx b/backend/test_files/sample_16_SAF.xlsx
diff --git a/.../annotations/test_files/sample_1_SAF.xlsx → backend/test_files/sample_1_SAF.xlsx b/.../annotations/test_files/sample_1_SAF.xlsx → backend/test_files/sample_1_SAF.xlsx
diff --git a/frontend/src/environments/version.ts b/frontend/src/environments/version.ts
@@ -1,2 +1,2 @@
 // TODO: Compile this from toplevel package.json
-export const version = '0.6.3';
+export const version = '0.7.1';
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sasta",
-    "version": "0.7.0",
+    "version": "0.7.1",
     "description": "Annotate and analyze transcripts",
     "author": "UU Digital Humanities Lab",
     "license": "BSD-3-Clause",