use types properly, add support for more arg types

Author: FredHappyface

cli2gui/application/application.py

@@ -24,9 +24,9 @@ def run(buildSpec: types.FullBuildSpec) -> Any:
 	"""
 
 	# Set the theme
-	theme = helpers.get_base24_theme(buildSpec["theme"], buildSpec["darkTheme"])
+	theme = helpers.get_base24_theme(buildSpec.theme, buildSpec.darkTheme)
 
-	if buildSpec["gui"] in [
+	if buildSpec.gui in [
 		"pysimplegui",
 		"pysimpleguiqt",
 		"pysimpleguiweb",
@@ -37,18 +37,18 @@ def run(buildSpec: types.FullBuildSpec) -> Any:
 		gui_wrapper = DearPyGuiWrapper
 
 	if gui_wrapper is PySimpleGUIWrapper:
-		gui = gui_wrapper(theme, buildSpec["gui"])
+		gui = gui_wrapper(theme, buildSpec.gui)
 	elif gui_wrapper is DearPyGuiWrapper:
 		gui = gui_wrapper(theme)
 
 	def quit_callback() -> None:
 		sys.exit(0)
 
 	def run_callback(values: dict[str, Any]) -> None:
-		args = argFormat(values, buildSpec["parser"])
-		if not buildSpec["run_function"]:
+		args = argFormat(values, buildSpec.parser)
+		if not buildSpec.run_function:
 			return args
-		buildSpec["run_function"](args)
+		buildSpec.run_function(args)
 		return None
 
 	try:

cli2gui/application/application2args.py

@@ -3,56 +3,86 @@
 from __future__ import annotations
 
 import argparse
+import optparse
+from pathlib import Path
 from typing import Any
 
-from cli2gui.types import ParserType
-
+from cli2gui.types import ParserType, SEP
+
+
+def processValue(key:str, value:str) -> tuple[str, Any]:
+	if SEP not in key:
+		return key, value or None
+	key, _type = key.split(SEP, maxsplit=1)
+	if len(str(value)) == 0 or value is None:
+		return key,None
+	if _type == "ItemType.Bool":
+		return key,bool(value)
+	if _type == "ItemType.File":
+		return key,open(value, encoding="utf-8")
+	if _type == "ItemType.Path":
+		return key,Path(value)
+	if _type == "ItemType.Int":
+		return key,int(value)
+	if _type == "ItemType.Text":
+		return key,value
+	if _type == "ItemType.Float":
+		return key,float(value)
+	if _type == "ItemType.List":
+		return key,value
+	if _type == "ItemType.Tuple":
+		return key,value
+	if _type == "ItemType.DateTime":
+		return key,value
+
+	return key,value
 
 def argparseFormat(values: dict[str, Any]) -> argparse.Namespace:
 	"""Format args for argparse."""
 	args = {}
 	for key in values:
-		# Empty strings and paths
-		if isinstance(values[key], str) and len(values[key]) == 0:
-			args[key] = None
-		# Paths end in '#', set the base key (used by argparse)
-		elif key[-1] == "#":  # File
-			args[key[:-1]] = open(values[key], encoding="utf-8")
-		else:
-			args[key] = values[key]
+		key, value = processValue(key, values[key])
+		args[key] = value
 	return argparse.Namespace(**args)
 
 
-def optparseFormat(values: dict[str, Any]) -> dict[str, Any]:
+def optparseFormat(values: dict[str, Any]) -> tuple[optparse.Values, list[str]]:
 	"""Format args for optparse."""
 	args = {}
 	for key in values:
-		args[key] = values[key] if values[key] else None
-	return args
+		key, value = processValue(key, values[key])
+		args[key] = value
+	return (optparse.Values(args), [])
 
 
 def getoptFormat(values: dict[str, Any]) -> tuple[list[Any], list[Any]]:
 	"""Format args for getopt."""
-	return ([(key, values[key]) for key in values if values[key]], [])
+	return ([
+		processValue(key, values[key])
+		for key in values if values[key]],
+		[]
+	)
 
 
 def docoptFormat(values: dict[str, Any]) -> dict[str, Any]:
 	"""Format args for docopt."""
+	import docopt
 	args = {}
 	for key in values:
-		args[key] = (
-			values[key] if not (isinstance(values[key], str) and len(values[key]) == 0) else None
-		)
-	return args
+		key, value = processValue(key, values[key])
+		args[key] = value
+	return docopt.Dict(args)
 
 
 def clickFormat(values: dict[str, Any]) -> list[Any]:
 	"""Format args for click."""
 	args = []
 	for key in values:
+
 		val = str(values[key])
 		if not callable(key) and len(val) > 0:
-			args.extend([key, val])
+			key, value = processValue(key, values[key])
+			args.extend([key, value])
 	return args
 
 

cli2gui/decorators.py

@@ -63,20 +63,20 @@ def createFromParser(
 			runCmd = quote(sourcePath)
 		else:
 			runCmd = f"{quote(sys.executable)} -u {quote(sourcePath)}"
-	buildSpec["program_name"] = buildSpec["program_name"] or Path(sys.argv[0]).name.replace(
+	buildSpec.program_name = buildSpec.program_name or Path(sys.argv[0]).name.replace(
 		".py", ""
 	)
 
 	# CUSTOM: this seems like a pretty poor pattern to use...
-	if buildSpec["parser"] == ParserType.CUSTOM:
-		buildSpec["parser"] = input(
+	if buildSpec.parser == ParserType.CUSTOM:
+		buildSpec.parser = input(
 			f"!Custom parser selected! Choose one of: {[x.value for x in ParserType]}"
 		)
-		if buildSpec["parser"] not in ParserType._value2member_map_:  # noqa: SLF001
+		if buildSpec.parser not in ParserType._value2member_map_:  # noqa: SLF001
 			msg = f"!Custom parser must be one of: {[x.value for x in ParserType]}"
 			raise RuntimeError(msg)
 
-	parser = buildSpec["parser"]
+	parser = buildSpec.parser
 	# Select parser
 	convertMap = {
 		"self": {
@@ -90,13 +90,13 @@ def createFromParser(
 		},
 	}
 	if parser in convertMap["self"]:
-		return FullBuildSpec(**convertMap["self"][parser](selfParser), **buildSpec)
+		return FullBuildSpec(**convertMap["self"][parser](selfParser).__dict__, **buildSpec.__dict__)
 	if parser in convertMap["args"]:
-		return FullBuildSpec(**convertMap["args"][parser](argsParser), **buildSpec)
+		return FullBuildSpec(**convertMap["args"][parser](argsParser).__dict__, **buildSpec.__dict__)
 
 	# click is unique in behaviour so we cant use the mapping -_-
 	if parser == ParserType.CLICK:
-		return FullBuildSpec(**click2json.convert(buildSpec["run_function"]), **buildSpec)
+		return FullBuildSpec(**click2json.convert(buildSpec.run_function).__dict__, **buildSpec.__dict__)
 
 	msg = f"!Parser must be one of: {[x.value for x in ParserType]}"
 	raise RuntimeError(msg)