Skip to content
Snippets Groups Projects
Commit 6ffeebee authored by Martin Weise's avatar Martin Weise
Browse files

Fixed the API, added comments

parent 38837b47
No related branches found
No related tags found
2 merge requests!81New stable release,!80Multiple features connected with user management and ownership of databases
This commit is part of merge request !81. Comments created here will be created in the context of that merge request.
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 152 additions and 156 deletions
.jupyter/api_authentication/models/column_dto.py
+ 9
− 9
Edit View file @ 6ffeebee
...@@ -90,10 +90,12 @@ class ColumnDto(object): ...@@ -90,10 +90,12 @@ class ColumnDto(object):
if references is not None: if references is not None:
self.references = references self.references = references
self.internal_name = internal_name self.internal_name = internal_name
if date_format is not None:
self.date_format = date_format self.date_format = date_format
self.auto_generated = auto_generated self.auto_generated = auto_generated
self.is_primary_key = is_primary_key self.is_primary_key = is_primary_key
self.column_type = column_type self.column_type = column_type
if column_concept is not None:
self.column_concept = column_concept self.column_concept = column_concept
if decimal_digits_before is not None: if decimal_digits_before is not None:
self.decimal_digits_before = decimal_digits_before self.decimal_digits_before = decimal_digits_before
...@@ -308,11 +310,11 @@ class ColumnDto(object): ...@@ -308,11 +310,11 @@ class ColumnDto(object):
if column_type is None: if column_type is None:
raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501
allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501 allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501
if column_type not in allowed_values: #if column_type not in allowed_values:
raise ValueError( # raise ValueError(
"Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501 # "Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501
.format(column_type, allowed_values) # .format(column_type, allowed_values)
) # )
self._column_type = column_type self._column_type = column_type
...@@ -334,8 +336,6 @@ class ColumnDto(object): ...@@ -334,8 +336,6 @@ class ColumnDto(object):
:param column_concept: The column_concept of this ColumnDto. # noqa: E501 :param column_concept: The column_concept of this ColumnDto. # noqa: E501
:type: ConceptDto :type: ConceptDto
""" """
if column_concept is None:
raise ValueError("Invalid value for `column_concept`, must not be `None`") # noqa: E501
self._column_concept = column_concept self._column_concept = column_concept
......
.jupyter/api_container/models/column_dto.py
+ 9
− 9
Edit View file @ 6ffeebee
...@@ -90,10 +90,12 @@ class ColumnDto(object): ...@@ -90,10 +90,12 @@ class ColumnDto(object):
if references is not None: if references is not None:
self.references = references self.references = references
self.internal_name = internal_name self.internal_name = internal_name
if date_format is not None:
self.date_format = date_format self.date_format = date_format
self.auto_generated = auto_generated self.auto_generated = auto_generated
self.is_primary_key = is_primary_key self.is_primary_key = is_primary_key
self.column_type = column_type self.column_type = column_type
if column_concept is not None:
self.column_concept = column_concept self.column_concept = column_concept
if decimal_digits_before is not None: if decimal_digits_before is not None:
self.decimal_digits_before = decimal_digits_before self.decimal_digits_before = decimal_digits_before
...@@ -308,11 +310,11 @@ class ColumnDto(object): ...@@ -308,11 +310,11 @@ class ColumnDto(object):
if column_type is None: if column_type is None:
raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501
allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501 allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501
if column_type not in allowed_values: #if column_type not in allowed_values:
raise ValueError( # raise ValueError(
"Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501 # "Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501
.format(column_type, allowed_values) # .format(column_type, allowed_values)
) # )
self._column_type = column_type self._column_type = column_type
...@@ -334,8 +336,6 @@ class ColumnDto(object): ...@@ -334,8 +336,6 @@ class ColumnDto(object):
:param column_concept: The column_concept of this ColumnDto. # noqa: E501 :param column_concept: The column_concept of this ColumnDto. # noqa: E501
:type: ConceptDto :type: ConceptDto
""" """
if column_concept is None:
raise ValueError("Invalid value for `column_concept`, must not be `None`") # noqa: E501
self._column_concept = column_concept self._column_concept = column_concept
......
.jupyter/api_database/models/column_dto.py
+ 9
− 9
Edit View file @ 6ffeebee
...@@ -90,10 +90,12 @@ class ColumnDto(object): ...@@ -90,10 +90,12 @@ class ColumnDto(object):
if references is not None: if references is not None:
self.references = references self.references = references
self.internal_name = internal_name self.internal_name = internal_name
if date_format is not None:
self.date_format = date_format self.date_format = date_format
self.auto_generated = auto_generated self.auto_generated = auto_generated
self.is_primary_key = is_primary_key self.is_primary_key = is_primary_key
self.column_type = column_type self.column_type = column_type
if column_concept is not None:
self.column_concept = column_concept self.column_concept = column_concept
if decimal_digits_before is not None: if decimal_digits_before is not None:
self.decimal_digits_before = decimal_digits_before self.decimal_digits_before = decimal_digits_before
...@@ -308,11 +310,11 @@ class ColumnDto(object): ...@@ -308,11 +310,11 @@ class ColumnDto(object):
if column_type is None: if column_type is None:
raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501
allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501 allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501
if column_type not in allowed_values: #if column_type not in allowed_values:
raise ValueError( # raise ValueError(
"Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501 # "Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501
.format(column_type, allowed_values) # .format(column_type, allowed_values)
) # )
self._column_type = column_type self._column_type = column_type
...@@ -334,8 +336,6 @@ class ColumnDto(object): ...@@ -334,8 +336,6 @@ class ColumnDto(object):
:param column_concept: The column_concept of this ColumnDto. # noqa: E501 :param column_concept: The column_concept of this ColumnDto. # noqa: E501
:type: ConceptDto :type: ConceptDto
""" """
if column_concept is None:
raise ValueError("Invalid value for `column_concept`, must not be `None`") # noqa: E501
self._column_concept = column_concept self._column_concept = column_concept
......
.jupyter/api_query/models/column_dto.py
+ 5
− 5
Edit View file @ 6ffeebee
...@@ -310,11 +310,11 @@ class ColumnDto(object): ...@@ -310,11 +310,11 @@ class ColumnDto(object):
if column_type is None: if column_type is None:
raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501
allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501 allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501
if column_type not in allowed_values: #if column_type not in allowed_values:
raise ValueError( # raise ValueError(
"Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501 # "Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501
.format(column_type, allowed_values) # .format(column_type, allowed_values)
) # )
self._column_type = column_type self._column_type = column_type
......
.jupyter/api_table/models/column_dto.py
+ 5
− 5
Edit View file @ 6ffeebee
...@@ -310,11 +310,11 @@ class ColumnDto(object): ...@@ -310,11 +310,11 @@ class ColumnDto(object):
if column_type is None: if column_type is None:
raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501 raise ValueError("Invalid value for `column_type`, must not be `None`") # noqa: E501
allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501 allowed_values = ["ColumnTypeDto.ENUM", "ColumnTypeDto.NUMBER", "ColumnTypeDto.DECIMAL", "ColumnTypeDto.STRING", "ColumnTypeDto.TEXT", "ColumnTypeDto.BOOLEAN", "ColumnTypeDto.DATE", "ColumnTypeDto.TIMESTAMP", "ColumnTypeDto.BLOB"] # noqa: E501
if column_type not in allowed_values: #if column_type not in allowed_values:
raise ValueError( # raise ValueError(
"Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501 # "Invalid value for `column_type` ({0}), must be one of {1}" # noqa: E501
.format(column_type, allowed_values) # .format(column_type, allowed_values)
) # )
self._column_type = column_type self._column_type = column_type
......
.jupyter/dev.py deleted 100755 → 0
+ 0
− 10
View file @ 38837b47
import csv
import time
with open('./resources/ugz_ogd_air_h1_2021.csv', mode='r', encoding='utf-8-sig') as f:
csv_reader = csv.reader(f, delimiter=',', quotechar='"')
for row in csv_reader:
payload = {'date': row[0], 'location': row[1], 'parameter': row[2], 'interval': row[3], 'unit': row[4],
'value': row[5], 'status': row[6]}
print('sending', payload, '...')
time.sleep(5)
.jupyter/feature_extract.ipynb
+ 113
− 108
Edit View file @ 6ffeebee
This diff is collapsed.
.jupyter/requirements.txt
+ 2
− 1
Edit View file @ 6ffeebee
requests==2.28.0 requests>=2.28.0
\ No newline at end of file pandas>=1.4.3
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment