dcicutils 8.10.0.1b3__tar.gz → 8.11.0.1b1__tar.gz
Sign up to get free protection for your applications and to get access to all the features.
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/PKG-INFO +1 -1
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/schema_utils.py +50 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/pyproject.toml +1 -1
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/LICENSE.txt +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/README.rst +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/__init__.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/base.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/beanstalk_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/bundle_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/captured_output.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/cloudformation_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/codebuild_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/command_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/common.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/contribution_scripts.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/contribution_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/creds_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/data_readers.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/data_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/datetime_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/deployment_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/diff_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/docker_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/ecr_scripts.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/ecr_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/ecs_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/env_base.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/env_manager.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/env_scripts.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/env_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/env_utils_legacy.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/es_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/exceptions.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/ff_mocks.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/ff_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/file_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/function_cache_decorator.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/glacier_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/http_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/jh_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/kibana/dashboards.json +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/kibana/readme.md +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/lang_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/c4-infrastructure.jsonc +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/c4-python-infrastructure.jsonc +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-common-server.jsonc +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-common.jsonc +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-gpl-pipeline.jsonc +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-pipeline.jsonc +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/log_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/misc_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/obfuscation_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/opensearch_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/portal_object_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/portal_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/progress_bar.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/project_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/qa_checkers.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/qa_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/redis_tools.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/redis_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/s3_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/scripts/publish_to_pypi.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/scripts/run_license_checker.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/scripts/view_portal_object.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/secrets_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/sheet_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/snapshot_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/ssl_certificate_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/structured_data.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/submitr/progress_constants.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/submitr/ref_lookup_strategy.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/task_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/tmpfile_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/trace_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/validation_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/variant_utils.py +0 -0
- {dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/zip_utils.py +0 -0
@@ -1,5 +1,6 @@
|
|
1
1
|
import os
|
2
2
|
from typing import Any, Dict, List, Optional, Tuple
|
3
|
+
|
3
4
|
from dcicutils.misc_utils import to_camel_case
|
4
5
|
|
5
6
|
|
@@ -8,6 +9,7 @@ class JsonSchemaConstants:
|
|
8
9
|
ARRAY = "array"
|
9
10
|
BOOLEAN = "boolean"
|
10
11
|
DEFAULT = "default"
|
12
|
+
DEPENDENT_REQUIRED = "dependentRequired"
|
11
13
|
ENUM = "enum"
|
12
14
|
FORMAT = "format"
|
13
15
|
INTEGER = "integer"
|
@@ -29,6 +31,10 @@ class EncodedSchemaConstants:
|
|
29
31
|
LINK_TO = "linkTo"
|
30
32
|
MERGE_REF = "$merge"
|
31
33
|
MIXIN_PROPERTIES = "mixinProperties"
|
34
|
+
SUBMISSION_COMMENT = "submissionComment"
|
35
|
+
SUBMISSION_EXAMPLES = "submissionExamples"
|
36
|
+
SUBMITTER_REQUIRED = "submitterRequired"
|
37
|
+
SUGGESTED_ENUM = "suggested_enum"
|
32
38
|
UNIQUE_KEY = "uniqueKey"
|
33
39
|
|
34
40
|
|
@@ -203,6 +209,50 @@ def get_description(schema: Dict[str, Any]) -> str:
|
|
203
209
|
return schema.get(SchemaConstants.DESCRIPTION, "")
|
204
210
|
|
205
211
|
|
212
|
+
def is_submitter_required(schema: Dict[str, Any]) -> bool:
|
213
|
+
"""Return True if the schema is marked as required for submitters.
|
214
|
+
|
215
|
+
Specifically, required for external (i.e. non-admin) submitters.
|
216
|
+
|
217
|
+
This is typically validated within the context of a oneOf, anyOf,
|
218
|
+
or allOf schema on an item type which is used within the team and
|
219
|
+
by external submitters, and is tricky to pick up on automatically.
|
220
|
+
"""
|
221
|
+
return schema.get(SchemaConstants.SUBMITTER_REQUIRED, False)
|
222
|
+
|
223
|
+
|
224
|
+
def get_submission_comment(schema: Dict[str, Any]) -> str:
|
225
|
+
"""Return the submission comment for a property.
|
226
|
+
|
227
|
+
Custom property that can be manually added to a schema to provide
|
228
|
+
additional context for submitters.
|
229
|
+
"""
|
230
|
+
return schema.get(SchemaConstants.SUBMISSION_COMMENT, "")
|
231
|
+
|
232
|
+
|
233
|
+
def get_submission_examples(schema: Dict[str, Any]) -> List[str]:
|
234
|
+
"""Return the submission example for a property.
|
235
|
+
|
236
|
+
Custom property that can be manually added to a schema to provide
|
237
|
+
an example for submitters.
|
238
|
+
"""
|
239
|
+
return schema.get(SchemaConstants.SUBMISSION_EXAMPLES, [])
|
240
|
+
|
241
|
+
|
242
|
+
def get_suggested_enum(schema: Dict[str, Any]) -> List[str]:
|
243
|
+
"""Return the suggested enum for a property.
|
244
|
+
|
245
|
+
Custom property that can be manually added to a schema to provide
|
246
|
+
a suggested list of values for submitters.
|
247
|
+
"""
|
248
|
+
return schema.get(SchemaConstants.SUGGESTED_ENUM, [])
|
249
|
+
|
250
|
+
|
251
|
+
def get_dependent_required(schema: Dict[str, Any]) -> Dict[str, List[str]]:
|
252
|
+
"""Return the dependent required properties of a schema."""
|
253
|
+
return schema.get(SchemaConstants.DEPENDENT_REQUIRED, {})
|
254
|
+
|
255
|
+
|
206
256
|
class Schema:
|
207
257
|
|
208
258
|
def __init__(self, schema: dict, type: Optional[str] = None) -> None:
|
@@ -1,6 +1,6 @@
|
|
1
1
|
[tool.poetry]
|
2
2
|
name = "dcicutils"
|
3
|
-
version = "8.
|
3
|
+
version = "8.11.0.1b1" # TODO: To become 8.12.0
|
4
4
|
description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
|
5
5
|
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
|
6
6
|
license = "MIT"
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/c4-infrastructure.jsonc
RENAMED
File without changes
|
File without changes
|
File without changes
|
{dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-common.jsonc
RENAMED
File without changes
|
{dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-gpl-pipeline.jsonc
RENAMED
File without changes
|
{dcicutils-8.10.0.1b3 → dcicutils-8.11.0.1b1}/dcicutils/license_policies/park-lab-pipeline.jsonc
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|