From 9ef09301c3c8282cb2975c7405a989a4664a406e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:59:12 +0000 Subject: [PATCH 01/12] Bump undici from 5.26.3 to 5.28.3 in /factsheet/frontend Bumps [undici](https://github.com/nodejs/undici) from 5.26.3 to 5.28.3. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](https://github.com/nodejs/undici/compare/v5.26.3...v5.28.3) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] --- factsheet/frontend/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/factsheet/frontend/package-lock.json b/factsheet/frontend/package-lock.json index 697e6ed18..28eb3281a 100644 --- a/factsheet/frontend/package-lock.json +++ b/factsheet/frontend/package-lock.json @@ -20962,9 +20962,9 @@ } }, "node_modules/undici": { - "version": "5.26.3", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz", - "integrity": "sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==", + "version": "5.28.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", + "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", "dependencies": { "@fastify/busboy": "^2.0.0" }, @@ -37042,9 +37042,9 @@ } }, "undici": { - "version": "5.26.3", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz", - "integrity": "sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==", + "version": "5.28.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", + "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", "requires": { "@fastify/busboy": "^2.0.0" } From d956bb8cc8354d763898245888c9625845c2baf4 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 14:56:48 +0100 Subject: [PATCH 02/12] deactivate function that attempts to connect to an external service #1593 --- modelview/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modelview/views.py b/modelview/views.py index 23a103abe..173949530 100644 --- a/modelview/views.py +++ b/modelview/views.py @@ -143,7 +143,7 @@ def show(request, sheettype, model_name): ) org = match.group("org") repo = match.group("repo") - _handle_github_contributions(org, repo) + # _handle_github_contributions(org, repo) except Exception: org = None repo = None @@ -343,8 +343,8 @@ def _handle_github_contributions(org, repo, timedelta=3600, weeks_back=8): If the image is not present or outdated it will be reconstructed Note: - Keep in mind that a external (GitHub) API is called and you server need to allow - such connections. + Keep in mind that a external (GitHub) API is called and your server + needs to allow such connections. """ path = "GitHub_{0}_{1}_Contribution.png".format(org, repo) full_path = os.path.join(djangoSettings.MEDIA_ROOT, path) From 4c35ad720581065b4565d2467b1eb4d022655361 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 14:57:17 +0100 Subject: [PATCH 03/12] update changelog #1593 --- versions/changelogs/current.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md index e51002c83..f0dd36bce 100644 --- a/versions/changelogs/current.md +++ b/versions/changelogs/current.md @@ -14,4 +14,6 @@ ## Bugs -Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) \ No newline at end of file +Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) + +Fix: Prevent functionality that attempts to connect to an external service and raises errors in the oep server logs. [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) From aed676302e9c0019bb4445caa6e070061430f715 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 15:00:01 +0100 Subject: [PATCH 04/12] update changelog #1593 --- versions/changelogs/current.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md index f0dd36bce..7b38b137a 100644 --- a/versions/changelogs/current.md +++ b/versions/changelogs/current.md @@ -16,4 +16,4 @@ Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) -Fix: Prevent functionality that attempts to connect to an external service and raises errors in the oep server logs. [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) +Fix: Prevent functionality that attempts to connect to an external service and raises errors in the oep server logs. [#1594](https://github.com/OpenEnergyPlatform/oeplatform/pull/1594) From d8c091df5c39548429cc1447de520f2c5f754808 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 20:30:43 +0100 Subject: [PATCH 05/12] on create_factsheet remove login_required and send 403 in case user is not logged in to ease error handling in frontend #1586 #1587 - formatting --- factsheet/views.py | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/factsheet/views.py b/factsheet/views.py index af672843d..305809b4a 100644 --- a/factsheet/views.py +++ b/factsheet/views.py @@ -1,10 +1,11 @@ import logging from django.shortcuts import render -from django.http import Http404, HttpResponse, JsonResponse +from django.http import Http404, HttpResponse, JsonResponse, HttpResponseForbidden import json from django.views.decorators.csrf import csrf_exempt from django.core import serializers from django.utils.cache import patch_response_headers + # import uuid # import requests # import rdflib @@ -15,6 +16,7 @@ from rdflib.graph import DATASET_DEFAULT_GRAPH_ID as default import os from oeplatform.settings import ONTOLOGY_ROOT, RDF_DATABASES, OPEN_ENERGY_ONTOLOGY_NAME + # from datetime import date from SPARQLWrapper import SPARQLWrapper, JSON import sys @@ -26,6 +28,7 @@ authentication_classes, permission_classes, ) + # from rest_framework.authentication import TokenAuthentication # from rest_framework.permissions import IsAuthenticated # from rest_framework.authtoken.models import Token @@ -56,14 +59,14 @@ oeo_owl = get_ontology(Ontology_URI_STR).load() -#query_endpoint = "http://localhost:3030/ds/query" -#update_endpoint = "http://localhost:3030/ds/update" +query_endpoint = "http://localhost:3030/ds/query" +update_endpoint = "http://localhost:3030/ds/update" -#query_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/query' -#update_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/update' +# query_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/query' +# update_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/update' -query_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/query" -update_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/update" +# query_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/query" +# update_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/update" sparql = SPARQLWrapper(query_endpoint) @@ -123,6 +126,14 @@ def undo_clean_name(name): def factsheets_index(request, *args, **kwargs): + # userLoggedIn = False + # if request.user.is_authenticated: + # userLoggedIn = True + + # context_data = { + # "userLoggedIn": userLoggedIn, + # } + return render(request, "factsheet/index.html") @@ -183,7 +194,7 @@ def get_oekg_modifications(request, *args, **kwargs): return response -@login_required +# @login_required def create_factsheet(request, *args, **kwargs): """ Creates a scenario bundle based on user's data. Currently, the minimum requirement to create a bundle is the "acronym". @@ -216,6 +227,10 @@ def create_factsheet(request, *args, **kwargs): "Factsheet saved" if successful, "Duplicate error" if the bundle's acronym exists. """ + + if not request.user.is_authenticated: + return HttpResponseForbidden("User not authenticated") + request_body = json.loads(request.body) name = request_body["name"] uid = request_body["uid"] @@ -888,7 +903,7 @@ def update_factsheet(request, *args, **kwargs): old_state=in_first.serialize(format="json-ld"), new_state=in_second.serialize(format="json-ld"), ) - #OEKG_Modifications_instance.save() + # OEKG_Modifications_instance.save() response = JsonResponse( "factsheet updated!", safe=False, content_type="application/json" @@ -1198,9 +1213,9 @@ def query_oekg(request, *args, **kwargs): study_keywords=str(study_keywords_list).replace("[", "").replace("]", ""), scenario_year_start=scenario_year_start_value, scenario_year_end=scenario_year_end_value, - funding_source_exp="OEO:OEO_00000509 ?funding_sources ;" - if funding_sources_list != [] - else "", + funding_source_exp=( + "OEO:OEO_00000509 ?funding_sources ;" if funding_sources_list != [] else "" + ), authors_exp="OEO:OEO_00000506 ?authors ;" if authors_list != [] else "", ) @@ -1568,13 +1583,12 @@ def get_all_sub_classes(cls, visited=None): childCount = len(list(cls.subclasses())) subclasses = cls.subclasses() - dict = { "name": cls.label.first(), "label": cls.label.first(), "value": cls.label.first(), "iri": cls.iri, - "definition": oeo.value(OEO[str(cls).split('.')[1]], OBO.IAO_0000115) + "definition": oeo.value(OEO[str(cls).split(".")[1]], OBO.IAO_0000115), } if childCount > 0: @@ -1586,7 +1600,7 @@ def get_all_sub_classes(cls, visited=None): return dict -#@login_required +# @login_required def populate_factsheets_elements(request, *args, **kwargs): scenario_class = oeo_owl.search_one( iri="http://openenergy-platform.org/ontology/oeo/OEO_00000364" @@ -1630,7 +1644,7 @@ def populate_factsheets_elements(request, *args, **kwargs): "label": sector_label, "value": sector_label, "sector_division": sector_division_URI, - "sector_difinition": sector_difinition + "sector_difinition": sector_difinition, } ) From fd4f0d7f398f669d013d42c932130e3af7b03c26 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 20:31:55 +0100 Subject: [PATCH 06/12] catch error in case user not logged in and 403 response is present -> redirect to login page #1586 --- .../frontend/src/components/factsheet.js | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/factsheet/frontend/src/components/factsheet.js b/factsheet/frontend/src/components/factsheet.js index ce8f524c1..4c6d4d638 100644 --- a/factsheet/frontend/src/components/factsheet.js +++ b/factsheet/frontend/src/components/factsheet.js @@ -384,15 +384,28 @@ function Factsheet(props) { headers: { 'X-CSRFToken': CSRFToken() } } ).then(response => { - if (response.data === 'Factsheet saved') { - navigate('/factsheet/fs/' + new_uid); - setIsCreated(true); - setOpenSavedDialog(true); - setUID(new_uid); - setOpenBackDrop(false); + if (response.status === 200) { + // Handle successful response + + if (response.data === 'Factsheet saved') { + navigate('/factsheet/fs/' + new_uid); + setIsCreated(true); + setOpenSavedDialog(true); + setUID(new_uid); + setOpenBackDrop(false); + } + else if (response.data === 'Factsheet exists') { + setOpenExistDialog(true); + setOpenBackDrop(false); + } + } - else if (response.data === 'Factsheet exists') { - setOpenExistDialog(true); + + }).catch(error => { + if (error.response && error.response.status === 403) { + // Handle "Access Denied" error + const redirectUrl = conf.toep + "/user/login/?next=/scenario-bundles/id/new"; + window.location.href = redirectUrl; } }); } else { @@ -435,6 +448,7 @@ function Factsheet(props) { } else if (response.data === 'Factsheet exists') { setOpenExistDialog(true); + setOpenBackDrop(false); } }) .catch(error => { @@ -453,6 +467,7 @@ function Factsheet(props) { } else { setEmptyAcronym(true); + setOpenBackDrop(false); } }; From 543786c5f2b0a04e18fc7a0c39e619aeb7bd393d Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 20:39:05 +0100 Subject: [PATCH 07/12] update changelog #1586 --- versions/changelogs/current.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md index e51002c83..7e42b4c9f 100644 --- a/versions/changelogs/current.md +++ b/versions/changelogs/current.md @@ -14,4 +14,6 @@ ## Bugs -Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) \ No newline at end of file +Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) + +- Fix: Users are now redirected to the login page if they attempt to create a new scenario bundle. (Note we will prevent not logged in users to open the create bundle page soon) [(#1595)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1595) From d2521e0203d291593f15d775d7b82469807f1946 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Sun, 18 Feb 2024 22:20:23 +0100 Subject: [PATCH 08/12] change scenario input field to "Scenario type" and add the scenario oeo term again #1543 --- factsheet/frontend/src/components/factsheet.js | 6 +++--- factsheet/frontend/src/components/scenario.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/factsheet/frontend/src/components/factsheet.js b/factsheet/frontend/src/components/factsheet.js index 4c6d4d638..765cc33c9 100644 --- a/factsheet/frontend/src/components/factsheet.js +++ b/factsheet/frontend/src/components/factsheet.js @@ -1938,14 +1938,14 @@ function Factsheet(props) {
- Scenario descriptors + Scenario type - {'A data descriptor is an information content entity that contains additional information about some data.'} + {'A scenario is an information content entity that contains statements about a possible future development based on a coherent and internally consistent set of assumptions and their motivation.'}
- More info from Open Energy Ontology (OEO).... + More info from Open Energy Ontology (OEO).... } diff --git a/factsheet/frontend/src/components/scenario.js b/factsheet/frontend/src/components/scenario.js index c337badce..7ee7d93c2 100644 --- a/factsheet/frontend/src/components/scenario.js +++ b/factsheet/frontend/src/components/scenario.js @@ -432,7 +432,7 @@ export default function Scenario(props) { {...props} labelGridSize = {3} fieldGridSize = {9} - spanValue="Scenario descriptors" + spanValue="Scenario type" tooltipText="A scenario is an information content entity that contains statements about a possible future development based on a coherent and internally consistent set of assumptions and their motivation." hrefLink="http://openenergy-platform.org/ontology/oeo/OEO_00000364" renderField={() => ( From d5a2a03c00aea293e6c6db8268ea09b6bf5b4599 Mon Sep 17 00:00:00 2001 From: Adel Memariani Date: Mon, 19 Feb 2024 13:11:53 +0100 Subject: [PATCH 09/12] fix bug in scenario regions and interacting regions #1580 --- factsheet/views.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/factsheet/views.py b/factsheet/views.py index 13c06036f..f0c50e17d 100644 --- a/factsheet/views.py +++ b/factsheet/views.py @@ -333,24 +333,24 @@ def create_factsheet(request, *args, **kwargs): if "interacting_regions" in item: for interacting_region in item["interacting_regions"]: interacting_region_URI = URIRef(interacting_region["iri"]) - interacting_regions = URIRef( + scenario_interacting_region = URIRef( "http://openenergy-platform.org/ontology/oekg/" + interacting_region["iri"] ) - bundle.add((interacting_regions, RDF.type, OEO.OEO_00020036)) + bundle.add((scenario_interacting_region, RDF.type, OEO.OEO_00020036)) bundle.add( - (interacting_regions, RDFS.label, Literal(region["name"])) + (scenario_interacting_region, RDFS.label, Literal(interacting_region["name"])) ) bundle.add( ( - interacting_regions, + scenario_interacting_region, OEKG["reference"], interacting_region_URI, ) ) bundle.add( - (scenario_URI, OEO.OEO_00020222, interacting_regions) + (scenario_URI, OEO.OEO_00020222, scenario_interacting_region) ) if "scenario_years" in item: @@ -651,31 +651,32 @@ def update_factsheet(request, *args, **kwargs): region_URI, ) ) + new_bundle.add((scenario_URI, OEO.OEO_00020220, scenario_region)) if "interacting_regions" in item: for interacting_region in item["interacting_regions"]: interacting_region_URI = URIRef(interacting_region["iri"]) - interacting_regions = URIRef( + scenario_interacting_region = URIRef( "http://openenergy-platform.org/ontology/oekg/" + interacting_region["iri"] ) new_bundle.add( - (interacting_regions, RDF.type, OEO.OEO_00020036) + (scenario_interacting_region, RDF.type, OEO.OEO_00020036) ) new_bundle.add( - (interacting_regions, RDFS.label, Literal(region["name"])) + (scenario_interacting_region, RDFS.label, Literal(interacting_region["name"])) ) new_bundle.add( ( - interacting_regions, + scenario_interacting_region, OEKG["reference"], interacting_region_URI, ) ) new_bundle.add( - (scenario_URI, OEO.OEO_00020222, interacting_regions) + (scenario_URI, OEO.OEO_00020222, scenario_interacting_region) ) if "scenario_years" in item: From 7e72c98139ce6443a59facfffc82731698cc7eab Mon Sep 17 00:00:00 2001 From: Adel Memariani Date: Mon, 19 Feb 2024 13:16:08 +0100 Subject: [PATCH 10/12] update changelog #1580 --- versions/changelogs/current.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md index e51002c83..d1e352b54 100644 --- a/versions/changelogs/current.md +++ b/versions/changelogs/current.md @@ -3,6 +3,7 @@ ## Changes - Disable view and edit button on create new page of the scenario bundles (issue #1576) [(#1577)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1577) +- Disable view and edit button on create new page of the scenario bundles (issue #1576) [(#1597)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1597) ## Features @@ -14,4 +15,4 @@ ## Bugs -Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) \ No newline at end of file +Bugfix: Delete a row using the http api leads to server error if table includes not nullable fields [#1581](https://github.com/OpenEnergyPlatform/oeplatform/pull/1581) From 0f0a1bfb25f9af5459de9b1612b7df8deceda936 Mon Sep 17 00:00:00 2001 From: Adel Memariani Date: Mon, 19 Feb 2024 13:19:03 +0100 Subject: [PATCH 11/12] update changelog #1597 --- versions/changelogs/current.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md index d1e352b54..22ad72ca5 100644 --- a/versions/changelogs/current.md +++ b/versions/changelogs/current.md @@ -3,7 +3,7 @@ ## Changes - Disable view and edit button on create new page of the scenario bundles (issue #1576) [(#1577)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1577) -- Disable view and edit button on create new page of the scenario bundles (issue #1576) [(#1597)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1597) +- Fix bug in saving and updating interacting regions (issue #1576) [(#1597)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1597) ## Features From 91541c1f5a6951c070368814358b15cc8f1823b2 Mon Sep 17 00:00:00 2001 From: Jonas Huber Date: Mon, 19 Feb 2024 16:24:39 +0100 Subject: [PATCH 12/12] avoid database query #1580 --- factsheet/views.py | 63 ++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/factsheet/views.py b/factsheet/views.py index f0c50e17d..4693c3593 100644 --- a/factsheet/views.py +++ b/factsheet/views.py @@ -61,11 +61,11 @@ query_endpoint = "http://localhost:3030/ds/query" update_endpoint = "http://localhost:3030/ds/update" -#query_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/query' -#update_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/update' +# query_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/query' +# update_endpoint = 'https://toekb.iks.cs.ovgu.de:3443/oekg/update' -#query_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/query" -#update_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/update" +# query_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/query" +# update_endpoint = "https://oekb.iks.cs.ovgu.de:3443/oekg_main/update" sparql = SPARQLWrapper(query_endpoint) @@ -338,9 +338,15 @@ def create_factsheet(request, *args, **kwargs): + interacting_region["iri"] ) - bundle.add((scenario_interacting_region, RDF.type, OEO.OEO_00020036)) bundle.add( - (scenario_interacting_region, RDFS.label, Literal(interacting_region["name"])) + (scenario_interacting_region, RDF.type, OEO.OEO_00020036) + ) + bundle.add( + ( + scenario_interacting_region, + RDFS.label, + Literal(interacting_region["name"]), + ) ) bundle.add( ( @@ -350,7 +356,11 @@ def create_factsheet(request, *args, **kwargs): ) ) bundle.add( - (scenario_URI, OEO.OEO_00020222, scenario_interacting_region) + ( + scenario_URI, + OEO.OEO_00020222, + scenario_interacting_region, + ) ) if "scenario_years" in item: @@ -651,7 +661,9 @@ def update_factsheet(request, *args, **kwargs): region_URI, ) ) - new_bundle.add((scenario_URI, OEO.OEO_00020220, scenario_region)) + new_bundle.add( + (scenario_URI, OEO.OEO_00020220, scenario_region) + ) if "interacting_regions" in item: for interacting_region in item["interacting_regions"]: @@ -665,7 +677,11 @@ def update_factsheet(request, *args, **kwargs): (scenario_interacting_region, RDF.type, OEO.OEO_00020036) ) new_bundle.add( - (scenario_interacting_region, RDFS.label, Literal(interacting_region["name"])) + ( + scenario_interacting_region, + RDFS.label, + Literal(interacting_region["name"]), + ) ) new_bundle.add( ( @@ -676,7 +692,11 @@ def update_factsheet(request, *args, **kwargs): ) new_bundle.add( - (scenario_URI, OEO.OEO_00020222, scenario_interacting_region) + ( + scenario_URI, + OEO.OEO_00020222, + scenario_interacting_region, + ) ) if "scenario_years" in item: @@ -891,7 +911,7 @@ def update_factsheet(request, *args, **kwargs): old_state=in_first.serialize(format="json-ld"), new_state=in_second.serialize(format="json-ld"), ) - #OEKG_Modifications_instance.save() + # OEKG_Modifications_instance.save() response = JsonResponse( "factsheet updated!", safe=False, content_type="application/json" @@ -901,10 +921,12 @@ def update_factsheet(request, *args, **kwargs): def is_logged_in(request, *args, **kwargs): - user=login_models.myuser.objects.filter(name=request.user).first() - + user = None + if request.user.is_authenticated: + user = True + output = "" - if user == None: + if user is None: output = "NOT_LOGGED_IN" else: output = "LOGGED_IN" @@ -1214,9 +1236,9 @@ def query_oekg(request, *args, **kwargs): study_keywords=str(study_keywords_list).replace("[", "").replace("]", ""), scenario_year_start=scenario_year_start_value, scenario_year_end=scenario_year_end_value, - funding_source_exp="OEO:OEO_00000509 ?funding_sources ;" - if funding_sources_list != [] - else "", + funding_source_exp=( + "OEO:OEO_00000509 ?funding_sources ;" if funding_sources_list != [] else "" + ), authors_exp="OEO:OEO_00000506 ?authors ;" if authors_list != [] else "", ) @@ -1584,13 +1606,12 @@ def get_all_sub_classes(cls, visited=None): childCount = len(list(cls.subclasses())) subclasses = cls.subclasses() - dict = { "name": cls.label.first(), "label": cls.label.first(), "value": cls.label.first(), "iri": cls.iri, - "definition": oeo.value(OEO[str(cls).split('.')[1]], OBO.IAO_0000115) + "definition": oeo.value(OEO[str(cls).split(".")[1]], OBO.IAO_0000115), } if childCount > 0: @@ -1602,7 +1623,7 @@ def get_all_sub_classes(cls, visited=None): return dict -#@login_required +# @login_required def populate_factsheets_elements(request, *args, **kwargs): scenario_class = oeo_owl.search_one( iri="http://openenergy-platform.org/ontology/oeo/OEO_00000364" @@ -1646,7 +1667,7 @@ def populate_factsheets_elements(request, *args, **kwargs): "label": sector_label, "value": sector_label, "sector_division": sector_division_URI, - "sector_difinition": sector_difinition + "sector_difinition": sector_difinition, } )