4 error at creating a dataset from url

Readme.md

@@ -1,6 +1,6 @@
 <h1 align="center">
   <img src="https://github.com/gdcc/easyDataverse/blob/main/static/logo.png" width=300 alt="EasyDataverse"></br>
-  <img src="https://img.shields.io/badge/EasyDataverse-0.3.9-blue" alt="v0.3.6">
+  <img src="https://img.shields.io/badge/EasyDataverse-0.3.10-blue" alt="v0.3.6">
   <img src="https://github.com/gdcc/easyDataverse/actions/workflows/build.yaml/badge.svg" alt="Build Badge">
 </a>
 </h1>

easyDataverse/__init__.py

@@ -1,4 +1,4 @@
 from easyDataverse.core import Dataset
 from easyDataverse.tools import ProgrammingLanguage
 
-__version__ = "0.3.9"
+__version__ = "0.3.10"

easyDataverse/tools/codegen/schema.py

@@ -22,9 +22,8 @@ def camel_to_snake(name):
 
 
 def spaced_to_snake(name) -> str:
-
     # Clean the title
-    name = re.sub(r"-|\?", "", name)
+    name = re.sub(r"-|\?", "_", name)
     name = name.replace(r"/", " ")
 
     return "_".join([word.lower() for word in name.replace("-", " ").split(" ")])
@@ -67,9 +66,7 @@ def generate_JSON_schema(
     parents = set(fields.parent)
 
     for parent in parents:
-
         if str(parent) == "nan":
-
             # Process any primitive field to JSON
             primitives = fields[
                 (fields["parent"].isna()) & (fields["fieldType"] != "none")

easyDataverse/tools/downloader/nolibutils.py

@@ -189,7 +189,7 @@ def _create_compound_class(field, lookup):
     cls.__name__ = cls_name
 
     # Create a new type from this
-    return name, description, cls
+    return _clean_name(name), description, cls
 
 
 def _parse_compound_fields(data: List, lookup):
@@ -200,11 +200,18 @@ def _parse_compound_fields(data: List, lookup):
     for member in data:
         for primitive in member.values():
             name, field = _parse_primitive(primitive, lookup)
+
             parsed_fields[name] = field
 
     return parsed_fields
 
 
+def _clean_name(name):
+    """Removes anything that is not a valid variable name"""
+
+    return re.sub(r"\-|\?|\(|\)|\[|\]|\.\\|\/", "_", name)
+
+
 def _parse_primitive(data: Dict, lookup: Dict):
     """Parses a primitive field. Returns name and field definition"""
 
@@ -218,7 +225,7 @@ def _parse_primitive(data: Dict, lookup: Dict):
 
     data["description"] = lookup[data["typeName"]]["description"]
 
-    return name, _create_primitive_field(lookup=lookup, **data)
+    return (_clean_name(name), _create_primitive_field(lookup=lookup, **data))
 
 
 def _create_primitive_field(lookup: Dict, **kwargs):
@@ -288,7 +295,6 @@ def populate_block_values(block_cls: DataverseBase, block_json: Dict):
         attr_name = _find_attribute(block_cls, field["typeName"])
 
         if field_type == "compound":
-
             for entry in field["value"]:
                 sub_class = _get_sub_class(block_cls, attr_name)
                 kwargs = {

setup.py

@@ -1,7 +1,7 @@
 import setuptools
 from setuptools import setup
 
-__VERSION__ = "0.3.9"
+__VERSION__ = "0.3.10"
 
 setup(
     name="easyDataverse",

tests/fixtures/blocks/testblock.tsv

@@ -3,7 +3,7 @@ b	ToyDataset		Toy Dataset
 #datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
 	fooField	foo	Some primitive field		text	0	#VALUE	TRUE	FALSE	FALSE	TRUE	TRUE	FALSE		ToyDataset	
 	fooCompound	compound	Some compound field		none	1	#VALUE	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		ToyDataset	
-	fooEnum	some_enum	Some enum field		text	2	#VALUE	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		ToyDataset	
+	fooEnum	some-enum	Some enum field		text	2	#VALUE	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		ToyDataset	
 	fooCompoundField	bar	Another primitive field		text	3	#VALUE	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	fooCompound	ToyDataset	
 #controlledVocabulary	DatasetField	Value	identifier	displayOrder												
 	fooEnum	enum	0	0