chore: remove all | from types to allow python 3.8/9 compatibility

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
 
       - uses: actions/setup-python@v1
         with:
-          python-version: "3.12"
+          python-version: "3.10"
 
       - name: Install dependencies
         run: |

.github/workflows/main.yml

@@ -21,9 +21,11 @@ jobs:
           - "ubuntu-py38"
           - "ubuntu-py39"
           - "ubuntu-py310"
-          - "macos-py37"
+          - "ubuntu-py312"
           - "macos-py38"
           - "macos-py39"
+          - "macos-py310"
+          - "macos-py312"
 
         include:
           - name: "linting"
@@ -42,6 +44,10 @@ jobs:
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310"
+          - name: "ubuntu-py312"
+            python: "3.12"
+            os: ubuntu-latest
+            tox_env: "py312"
           - name: "macos-py38"
             python: "3.8"
             os: macos-latest
@@ -54,10 +60,6 @@ jobs:
             python: "3.10"
             os: macos-latest
             tox_env: "py310"
-          - name: "macos-py311"
-            python: "3.11"
-            os: macos-latest
-            tox_env: "py311"
           - name: "macos-py312"
             python: "3.12"
             os: macos-latest

fuzz/README.md

@@ -0,0 +1,14 @@
+# Fuzzing 
+
+WIP
+
+## Goals 
+
+- Find uncaught errors in the parser reducing overall bugs 
+- Generating corpus' of data to benchmark performance  
+
+### Resources 
+
+- [nlohmann/json fuzzing](https://github.com/nlohmann/json/blob/develop/tests/fuzzing.md)
+- [hypothesis](https://github.com/HypothesisWorks/hypothesis)
+  - [docs](https://hypothesis.readthedocs.io/en/latest/)

fuzz/corpus-gen.sh

@@ -0,0 +1,11 @@
+TEST_DATA_VERSION=3.1.0
+wget https://github.com/nlohmann/json_test_data/archive/refs/tags/v$TEST_DATA_VERSION.zip
+unzip v$TEST_DATA_VERSION.zip
+rm v$TEST_DATA_VERSION.zip
+for FORMAT in json bjdata bson cbor msgpack ubjson
+do
+  rm -fr corpus_$FORMAT
+  mkdir corpus_$FORMAT
+  find json_test_data-$TEST_DATA_VERSION -size -5k -name "*.$FORMAT" -exec cp "{}" "corpus_$FORMAT" \;
+done
+rm -fr json_test_data-$TEST_DATA_VERSION

hooks/model_data.py

@@ -1,7 +1,4 @@
-import sys
-import os
-import importlib
-from typing import Type
+from typing import Type, Optional
 from pydantic import BaseModel, field_validator
 
 from tackle import BaseHook, Context
@@ -14,7 +11,7 @@
 
 class ModelOutput(BaseModel):
     name: str
-    description: str | None
+    description: Optional[str]
     type: str
 
 

hooks/provider_docs.py

@@ -4,7 +4,6 @@
 import string
 import importlib.machinery
 import json
-from types import UnionType
 
 from pydantic import BaseModel, Field
 import inspect

providers/arithmatic/hooks/modulo.py

@@ -1,3 +1,5 @@
+from typing import Optional, Union
+
 from tackle import BaseHook, Field
 
 
@@ -18,15 +20,15 @@ class ModuloHook(BaseHook):
         ...,
         description="The divisor to take the modulo with.",
     )
-    equal_to: int | None = Field(
+    equal_to: Optional[int] = Field(
         None,
         description="Optional parameter to assert if the modulo is equal to. Returns a "
                     "bool then.",
     )
 
     args: list = ['input', 'divisor', 'equal_to']
 
-    def exec(self) -> int | bool:
+    def exec(self) -> Union[int, bool]:
         if self.equal_to is not None:
             return self.input % self.divisor == self.equal_to
         return self.input % self.divisor

providers/logic/hooks/match.py

@@ -15,7 +15,7 @@ class MatchHook(BaseHook):
     """
 
     hook_name: str = 'match'
-    value: str | int | float | bool = Field(
+    value: Union[str, int, float, bool] = Field(
         True,
         render_by_default=True,
         description="The value to match against. Defaults to boolean true so that "

providers/paths/hooks/listdir.py

@@ -2,7 +2,7 @@
 import re
 from typing import Union
 
-from tackle import BaseHook, Field
+from tackle import BaseHook, Field, exceptions, Context
 
 
 class ListdirHook(BaseHook):
@@ -30,8 +30,12 @@ class ListdirHook(BaseHook):
     args: list = ['path']
     _docs_order = 2
 
-    def exec(self) -> list:
-        files = os.listdir(os.path.expanduser(os.path.expandvars(self.path)))
+    @property
+    def exec(self, context: Context) -> list:
+        try:
+            files = os.listdir(os.path.expanduser(os.path.expandvars(self.path)))
+        except FileNotFoundError as e:
+            raise exceptions.HookCallException(f"FileNotFoundError - {e}", context)
         if self.sort:
             files.sort()
         if self.ignore_hidden:

providers/strings/hooks/strings.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import Union
 
 from tackle import BaseHook, Field
 
@@ -23,7 +23,7 @@ class JoinHook(BaseHook):
 
     hook_name: str = 'join'
 
-    input: List[str | int] = Field(
+    input: list[Union[str, int]] = Field(
         ..., description="A list of strings to join.", render_by_default=True
     )
     separator: str = Field('', description="String separator.")

providers/tackle/hooks/import.py

@@ -1,3 +1,5 @@
+from typing import Optional, Union
+
 from pydantic import BaseModel, Field, field_validator, ValidationInfo, ValidationError  # noqa
 
 from tackle.utils.command import unpack_args_kwargs_string
@@ -8,8 +10,8 @@
 class RepoSource(BaseModel):
     """Repo object."""
     src: str
-    version: str | None = None
-    latest: bool | None = None
+    version: Optional[str] = None
+    latest: Optional[bool] = None
 
     @field_validator('latest')
     def check_both_version_and_latest_defined(cls, v: bool, info: ValidationInfo):
@@ -27,7 +29,7 @@ class ImportHook(BaseHook):
     """
 
     hook_name: str = 'import'
-    src: str | list = Field(
+    src: Union[str, list] = Field(
         ...,
         description="A str reference to a source or a list of dicts with strings that "
                     "will be expanded with args (ie `foo --version latest`) or objects "

providers/tackle/hooks/tackles.py

@@ -65,7 +65,7 @@ class TackleHook(BaseHook):
     kwargs: str = 'override'
     _docs_order = 0
 
-    def exec(self, context: Context) -> dict | list:
+    def exec(self, context: Context) -> Union[dict, list]:
         if self.input_arg is None:
             # If not given, assume we're looking for default tackle file in current dir
             self.input_arg = '.'

requirements-dev.txt

@@ -6,4 +6,3 @@ freezegun
 flake8
 ptyprocess
 requests
-pytest-asyncio

tackle/context.py

@@ -1,3 +1,5 @@
+from typing import Optional, Union
+
 from jinja2 import Environment, StrictUndefined
 # from jinja2 import StrictUndefined
 from jinja2.nativetypes import NativeEnvironment as Environment
@@ -11,30 +13,30 @@
 
 @dataclass
 class Source:
-    input_string: str | None = None
-    checkout: str | None = None
-    latest: bool | None = None
-    find_in_parent: bool | None = None
-    directory: str | None = None
-    file: str | None = None
-    base_dir: str | None = None
-    hooks_dir: str | None = None
-    name: str | None = None
-    raw: dict | list = None
+    input_string: Optional[str] = None
+    checkout: Optional[str] = None
+    latest: Optional[bool] = None
+    find_in_parent: Optional[bool] = None
+    directory: Optional[str] = None
+    file: Optional[str] = None
+    base_dir: Optional[str] = None
+    hooks_dir: Optional[str] = None
+    name: Optional[str] = None
+    raw: Union[dict, list] = None
 
 
 @dataclass
 class Data:
-    input: DocumentType | None = None
-    raw_input: DocumentType | None = None
-    pre_input: DocumentType | None = None
-    post_input: DocumentType | None = None
-    hooks_input: DocumentObjectType | None = None
-    public: DocumentType | None = None
-    private: DocumentType | None = None
-    temporary: DocumentType | None = None
-    existing: DocumentObjectType | None = None
-    overrides: DocumentObjectType | None = None
+    input: Optional[DocumentType] = None
+    raw_input: Optional[DocumentType] = None
+    pre_input: Optional[DocumentType] = None
+    post_input: Optional[DocumentType] = None
+    hooks_input: Optional[DocumentObjectType] = None
+    public: Optional[DocumentType] = None
+    private: Optional[DocumentType] = None
+    temporary: Optional[DocumentType] = None
+    existing: Optional[DocumentObjectType] = None
+    overrides: Optional[DocumentObjectType] = None
 
 
 @dataclass
@@ -93,11 +95,11 @@ class Context:
     key_path_block: list = None
 
     # Internal data objects
-    input: InputArguments | None = None
-    source: Source | None = None
-    hooks: Hooks | None = None
-    data: Data | None = None
-    path: Paths | None = None
+    input: Optional[InputArguments] = None
+    source: Optional[Source] = None
+    hooks: Optional[Hooks] = None
+    data: Optional[Data] = None
+    path: Optional[Paths] = None
 
     # Flag to denote to exit parsing
     break_: bool = False

tackle/factory.py

@@ -79,7 +79,7 @@ def create_hooks(
         )
 
 
-def extract_base_file(context: 'Context') -> list | dict:
+def extract_base_file(context: 'Context') -> Union[list, dict]:
     """Read the tackle file and initialize input_context."""
     if context.source.file:
         try:
@@ -127,10 +127,10 @@ def get_overrides(
 def new_data(
         *,
         context: 'Context',
-        raw_input: dict | list | None = None,
-        overrides: str | dict | None = None,
-        existing_data: str | dict | None = None,
-        _data: Data | None = None,
+        raw_input: Union[dict,  list, None] = None,
+        overrides: Union[str, dict, None] = None,
+        existing_data: Union[str, dict, None] = None,
+        _data: Optional[Data] = None,
 ) -> Data:
     """
     Create a data object which stores data as the source is parsed. When tackle is
@@ -521,9 +521,9 @@ def new_context(
         hooks_dir: str = None,
         _strict_source: bool = False,  # Raise if source not found
         # Data
-        raw_input: dict | list | None = None,
+        raw_input: Union[dict, list, None] = None,
         overrides: Union[str, dict] = None,
-        existing_data: str | dict | None = None,
+        existing_data: Union[str, dict, None] = None,
         # Context
         no_input: bool = None,
         verbose: bool = None,

tackle/hooks.py

@@ -236,7 +236,7 @@ def get_hook_field_type_from_str(
         context: Context,
         hook_name: str,
         type_str: str,
-) -> GenericFieldType | None:
+) -> Optional[GenericFieldType]:
     """
     Get the type from a field's type string and raise an error if the type is unknown.
      Supports the following types:
@@ -406,7 +406,7 @@ def create_hook_field_validator(
         hook_name: str,
         key: str,
         value: dict,
-        validator_field: str | dict,
+        validator_field: Union[str, dict],
 ) -> GenericFieldType:
     """
     Creates a validator by parsing a hook fields `validator` key and does some light
@@ -630,7 +630,7 @@ def create_dcl_hook_fields(
 def new_dcl_hook_input(
         context: 'Context',
         hook_name: str,
-        hook_input_dict: dict | str,
+        hook_input_dict: Union[dict, str],
 ) -> DclHookInput:
     """
     Create the hook_input which are keys supplied in the hook definition that inform how
@@ -659,7 +659,7 @@ def get_model_config_from_hook_input(
         context: Context,
         hook_name: str,
         hook_input_dict: dict,
-) -> DclHookModelConfig | None:
+) -> Optional[DclHookModelConfig]:
     """If the `model_config` field is declared, pop it off and return an object."""
     if 'model_config' in hook_input_dict:
         model_config = hook_input_dict.pop('model_config')
@@ -697,7 +697,7 @@ def get_model_config_from_hook_input(
 def create_dcl_hook(
         context: 'Context',
         hook_name: str,
-        hook_input_raw: dict | str,
+        hook_input_raw: Union[dict, str],
 ) -> 'Type[BaseHook]':
     """
     Create a model from the hook input dict. Calls numerous functions to upgrade the
@@ -857,7 +857,7 @@ def enrich_hook(
 def get_hooks_from_namespace(
         context: 'Context',
         hook_name: str,
-) -> CompiledHookType | None:
+) -> Optional[CompiledHookType]:
     """Get the public, private, or native hook from the context."""
     if hook_name == '_default':
         return context.hooks.default