From ffe42d08284fac903720db93934fcf8b38005354 Mon Sep 17 00:00:00 2001 From: Pablo Date: Thu, 16 Mar 2023 21:13:07 -0300 Subject: [PATCH 1/4] Check if text field exists --- quantipy/core/tools/dp/forsta/reader.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/quantipy/core/tools/dp/forsta/reader.py b/quantipy/core/tools/dp/forsta/reader.py index 61adfb6b..a6c33680 100644 --- a/quantipy/core/tools/dp/forsta/reader.py +++ b/quantipy/core/tools/dp/forsta/reader.py @@ -60,7 +60,7 @@ def get_grid_items(variable): else: source = "columns@{variable_name}_{field}" \ .format(variable_name=variable['name'], field=field['code']) - language_code = field['texts'][0].get('languageId') + language_code = field['texts'][0].get('languageId') if field.get("texts") else None language_text = {} if language_code: language_text[languages[language_code]] = field['texts'][0]['text'] @@ -135,8 +135,11 @@ def get_nodes_children(value): should_add_code_mapping = True col_values_val = idx + 1 - language_code = value["texts"][0]["languageId"] - values_dict = {"text": { languages[language_code]: value["texts"][0]["text"]}, "value": col_values_val} + values_dict = {"value": col_values_val} + if value.get("texts"): + language_code = value["texts"][0]["languageId"] + values_dict["text"] = { languages[language_code]: value["texts"][0]["text"]} + if value.get('score'): values_dict["factor"] = int(value.get('score')) col_values_arr.append(values_dict) From 3eb7bb7838268d8cc1d7d9b390d0ce3b3d5384e7 Mon Sep 17 00:00:00 2001 From: Pablo Date: Mon, 27 Mar 2023 11:12:39 -0300 Subject: [PATCH 2/4] Bump up version --- quantipy/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantipy/version.py b/quantipy/version.py index 8d167bc8..063fc750 100644 --- a/quantipy/version.py +++ b/quantipy/version.py @@ -1 +1 @@ -version = '0.1.1' \ No newline at end of file +version = '0.1.2' \ No newline at end of file From b380db45f13e10fb3c340ad9ef5f88f2468ef6bf Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 31 Mar 2023 13:14:36 -0300 Subject: [PATCH 3/4] Add empty text in default language in qpe if no texts field in forsta --- quantipy/core/tools/dp/forsta/reader.py | 2 ++ quantipy/version.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/quantipy/core/tools/dp/forsta/reader.py b/quantipy/core/tools/dp/forsta/reader.py index a6c33680..934ec4c8 100644 --- a/quantipy/core/tools/dp/forsta/reader.py +++ b/quantipy/core/tools/dp/forsta/reader.py @@ -139,6 +139,8 @@ def get_nodes_children(value): if value.get("texts"): language_code = value["texts"][0]["languageId"] values_dict["text"] = { languages[language_code]: value["texts"][0]["text"]} + else: + values_dict["text"] = { global_language: ''} if value.get('score'): values_dict["factor"] = int(value.get('score')) diff --git a/quantipy/version.py b/quantipy/version.py index 063fc750..56aff146 100644 --- a/quantipy/version.py +++ b/quantipy/version.py @@ -1 +1 @@ -version = '0.1.2' \ No newline at end of file +version = '0.1.3' \ No newline at end of file From ea55588db4d4e8ab1c8bea8a3363a4a4359234a0 Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 31 Mar 2023 13:27:01 -0300 Subject: [PATCH 4/4] Bump up version --- quantipy/version.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quantipy/version.py b/quantipy/version.py index 56aff146..8f8045ce 100644 --- a/quantipy/version.py +++ b/quantipy/version.py @@ -1 +1 @@ -version = '0.1.3' \ No newline at end of file +version = '0.2.13' \ No newline at end of file diff --git a/setup.py b/setup.py index 55773a6e..b2548b4a 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ def version_libs(libs, precisions, versions): INSTALL_REQUIRES = version_libs(libs, precisions, versions) setup(name='quantipy3', - version='0.2.12', + version='0.2.13', author='Geir Freysson', author_email='geir@datasmoothie.com', packages=find_packages(exclude=['tests']),