feat: add command excel2json to create JSON project file from folder with Excel files (DEV-960) #248
Conversation
| @@ -10,7 +10,7 @@ CURRENT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) | |||
| .PHONY: dsp-stack | |||
| dsp-stack: ## clone the dsp-api git repository and run the dsp-stack | |||
| @mkdir -p .tmp | |||
| @git clone --branch main --single-branch --depth 1 https://github.com/dasch-swiss/dsp-api.git .tmp/dsp-stack | |||
| @git clone --branch v24.0.8 --single-branch https://github.com/dasch-swiss/dsp-api.git .tmp/dsp-stack | |||
There was a problem hiding this comment.
This is temporary, I plan to revert this as soon as the other PR is merged that fixes the project IRIs. But as long as the API is not released, I don't want to merge the other PR, so that I could also make a release of dsp-tools before the API is released.
| with open("knora/dsplib/schemas/lists-only.json") as schema: | ||
| current_dir = os.path.dirname(os.path.realpath(__file__)) | ||
| with open(os.path.join(current_dir, "../schemas/lists-only.json")) as schema: |
There was a problem hiding this comment.
is this change really needed? seems more complex to me, without any added benefit I could think of
There was a problem hiding this comment.
The old version only worked because during development, I always invoke commands from the directory dsp-tools (=working directory). As soon as the working directory is different, it doesn't work any more. I wonder why it worked for our customers until now...
There was a problem hiding this comment.
did you install it with -e flag maybe? in any case, if that fixes it, all the better
There was a problem hiding this comment.
Yes, I thought that would be the only sensible way to install it for development. The point is that I often want to test a dsp-tools command from terminal, and I want that it takes the one I am editing/developing currently.
There was a problem hiding this comment.
sure, makes sense, but of course this may change the behaviour of relative paths compared to how users experience it
| data_model_templates | ||
| |-- lists | ||
| | |-- de.xlsx | ||
| | `-- en.xlsx | ||
| `-- onto_name (onto_label) | ||
| |-- properties.xlsx | ||
| `-- resources.xlsx |
There was a problem hiding this comment.
this kind of setup doesn't seem very user friendly to me... but I suppose this was identified as a requirement?
There was a problem hiding this comment.
Thanks for the hint. I'm going to ask some RDU people what they think.
| with open("knora/dsplib/schemas/properties-only.json") as schema: | ||
| current_dir = os.path.dirname(os.path.realpath(__file__)) | ||
| with open(os.path.join(current_dir, "../schemas/properties-only.json")) as schema: |
| with open("knora/dsplib/schemas/resources-only.json") as schema: | ||
| current_dir = os.path.dirname(os.path.realpath(__file__)) | ||
| with open(os.path.join(current_dir, "../schemas/resources-only.json")) as schema: |
test/e2e/test_tools.py
Outdated
| import copy | ||
| import datetime | ||
| import json | ||
| import unittest | ||
| import os | ||
| import datetime | ||
| import re | ||
| import unittest | ||
|
|
||
| import jsonpath_ng | ||
| import jsonpath_ng.ext | ||
| import copy | ||
|
|
||
| from knora.dsplib.utils.excel_to_json_lists import excel2lists, validate_lists_section_with_schema | ||
| from knora.dsplib.utils.excel_to_json_project import excel2project | ||
| from knora.dsplib.utils.excel_to_json_properties import excel2properties | ||
| from knora.dsplib.utils.excel_to_json_resources import excel2resources | ||
| from knora.dsplib.utils.id_to_iri import id_to_iri | ||
| from knora.dsplib.utils.onto_create_ontology import create_project | ||
| from knora.dsplib.utils.onto_validate import validate_project | ||
| from knora.dsplib.utils.onto_create_lists import create_lists | ||
| from knora.dsplib.utils.onto_create_ontology import create_project | ||
| from knora.dsplib.utils.onto_get import get_ontology | ||
| from knora.dsplib.utils.xml_upload import xml_upload | ||
| from knora.dsplib.utils.onto_validate import validate_project | ||
| from knora.dsplib.utils.shared import validate_xml_against_schema | ||
| from knora.dsplib.utils.xml_upload import xml_upload | ||
| from knora.excel2xml import excel2xml |
There was a problem hiding this comment.
what tool does this import sorting? would be nice for the diffs, if those would only show up once (i.e. always the same automation)
There was a problem hiding this comment.
Some weeks ago, I told PyCharm to do this. I thought it would be a good idea. I only work with PyCharm, and I think I will continue doing so, so there is only 1 tool that does this sorting. Do you think it costs more nerves than it benefits?
There was a problem hiding this comment.
No, if it's only one tool and it does it in a consistent way, it's definitely a good thing
restructure docs
jnussbaum
changed the title
resolves DEV-960