tracdap-runtime 0.6.5__py3-none-any.whl → 0.7.0__py3-none-any.whl

tracdap/rt/_impl/type_system.py

@@ -1,8 +1,9 @@
-#  Copyright 2022 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_impl/util.py

@@ -1,8 +1,9 @@
-#  Copyright 2022 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ -262,6 +263,16 @@ def get_args(metaclass: type):
         return None
 
 
+def get_constraints(metaclass: tp.TypeVar):
+
+    return metaclass.__constraints__ or None
+
+
+def get_bound(metaclass: tp.TypeVar):
+
+    return metaclass.__bound__ or None
+
+
 def try_clean_dir(dir_path: pathlib.Path, remove: bool = False) -> bool:
 
     normalized_path = windows_unc_path(dir_path)

tracdap/rt/_impl/validation.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-# 
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 # 
 #      http://www.apache.org/licenses/LICENSE-2.0
 # 
@@ -44,10 +45,25 @@ def check_type(expected_type: tp.Type, value: tp.Any) -> bool:
     return _TypeValidator.check_type(expected_type, value)
 
 
+def type_name(type_: tp.Type, qualified: bool) -> str:
+    return _TypeValidator._type_name(type_, qualified)  # noqa
+
+
 def quick_validate_model_def(model_def: meta.ModelDefinition):
     StaticValidator.quick_validate_model_def(model_def)
 
 
+def is_primitive_type(basic_type: meta.BasicType) -> bool:
+    return StaticValidator.is_primitive_type(basic_type)
+
+
+T_SKIP_VAL = tp.TypeVar("T_SKIP_VAL")
+
+class SkipValidation(tp.Generic[T_SKIP_VAL]):
+    def __init__(self, skip_type: tp.Type[T_SKIP_VAL]):
+        self.skip_type = skip_type
+
+
 class _TypeValidator:
 
     # The metaclass for generic types varies between versions of the typing library
@@ -56,28 +72,28 @@ class _TypeValidator:
 
     # Cache method signatures to avoid inspection on every call
     # Inspecting a function signature can take ~ half a second in Python 3.7
-    __method_cache: tp.Dict[str, inspect.Signature] = dict()
+    __method_cache: tp.Dict[str, tp.Tuple[inspect.Signature, tp.Any]] = dict()
 
     _log: logging.Logger = util.logger_for_namespace(__name__)
 
     @classmethod
     def validate_signature(cls, method: tp.Callable, *args, **kwargs):
 
-        if method.__name__ in cls.__method_cache:
-            signature = cls.__method_cache[method.__name__]
+        if method.__qualname__ in cls.__method_cache:
+            signature, hints = cls.__method_cache[method.__qualname__]
         else:
             signature = inspect.signature(method)
-            cls.__method_cache[method.__name__] = signature
-
-        hints = tp.get_type_hints(method)
+            hints = tp.get_type_hints(method)
+            cls.__method_cache[method.__qualname__] = signature, hints
 
+        named_params = list(signature.parameters.keys())
         positional_index = 0
 
         for param_name, param in signature.parameters.items():
 
             param_type = hints.get(param_name)
 
-            values = cls._select_arg(method.__name__, param, positional_index, *args, **kwargs)
+            values = cls._select_arg(method.__name__, param, positional_index, named_params, *args, **kwargs)
             positional_index += len(values)
 
             for value in values:
@@ -86,11 +102,12 @@ class _TypeValidator:
     @classmethod
     def validate_return_type(cls, method: tp.Callable, value: tp.Any):
 
-        if method.__name__ in cls.__method_cache:
-            signature = cls.__method_cache[method.__name__]
+        if method.__qualname__ in cls.__method_cache:
+            signature, hints = cls.__method_cache[method.__qualname__]
         else:
             signature = inspect.signature(method)
-            cls.__method_cache[method.__name__] = signature
+            hints = tp.get_type_hints(method)
+            cls.__method_cache[method.__qualname__] = signature, hints
 
         correct_type = cls._validate_type(signature.return_annotation, value)
 
@@ -107,7 +124,7 @@ class _TypeValidator:
 
     @classmethod
     def _select_arg(
-            cls, method_name: str, parameter: inspect.Parameter, positional_index,
+            cls, method_name: str, parameter: inspect.Parameter, positional_index, named_params,
             *args, **kwargs) -> tp.List[tp.Any]:
 
         if parameter.kind == inspect.Parameter.POSITIONAL_ONLY:
@@ -152,7 +169,7 @@ class _TypeValidator:
 
         if parameter.kind == inspect.Parameter.VAR_KEYWORD:
 
-            raise ex.ETracInternal("Validation of VAR_KEYWORD params is not supported yet")
+            return [arg for kw, arg in kwargs.items() if kw not in named_params]
 
         raise ex.EUnexpected("Invalid method signature in runtime API (this is a bug)")
 
@@ -180,6 +197,12 @@ class _TypeValidator:
         if expected_type == tp.Any:
             return True
 
+        # Sometimes we need to validate a partial set of arguments
+        # Explicitly passing a SkipValidation value allows for this
+        if isinstance(value, SkipValidation):
+            if value.skip_type == expected_type:
+                return True
+
         if isinstance(expected_type, cls.__generic_metaclass):
 
             origin = util.get_origin(expected_type)
@@ -216,8 +239,31 @@ class _TypeValidator:
                     all(map(lambda k: cls._validate_type(key_type, k), value.keys())) and \
                     all(map(lambda v: cls._validate_type(value_type, v), value.values()))
 
+            if origin.__module__.startswith("tracdap.rt.api."):
+                return isinstance(value, origin)
+
             raise ex.ETracInternal(f"Validation of [{origin.__name__}] generic parameters is not supported yet")
 
+        # Support for generic type variables
+        if isinstance(expected_type, tp.TypeVar):
+
+            # If there are any constraints or a bound, those must be honoured
+
+            constraints =  util.get_constraints(expected_type)
+            bound = util.get_bound(expected_type)
+
+            if constraints:
+                if not any(map(lambda c: type(value) == c, constraints)):
+                    return False
+
+            if bound:
+                if not isinstance(value, bound):
+                    return False
+
+            # So long as constraints / bound are ok, any type matches a generic type var
+            return True
+
+
         # Validate everything else as a concrete type
 
         # TODO: Recursive validation of types for class members using field annotations
@@ -237,7 +283,10 @@ class _TypeValidator:
                 return f"Named[{named_type}]"
 
             if origin is tp.Union:
-                return "|".join(map(cls._type_name, args))
+                if len(args) == 2 and args[1] == type(None):
+                    return f"Optional[{cls._type_name(args[0])}]"
+                else:
+                    return "|".join(map(cls._type_name, args))
 
             if origin is list:
                 list_type = cls._type_name(args[0])
@@ -274,6 +323,11 @@ class StaticValidator:
 
     _log: logging.Logger = util.logger_for_namespace(__name__)
 
+    @classmethod
+    def is_primitive_type(cls, basic_type: meta.BasicType) -> bool:
+
+        return basic_type in cls.__PRIMITIVE_TYPES
+
     @classmethod
     def quick_validate_model_def(cls, model_def: meta.ModelDefinition):
 

tracdap/rt/_plugins/__init__.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/_helpers.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/config_local.py

@@ -1,8 +1,9 @@
-#  Copyright 2024 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/format_arrow.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/format_csv.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/format_parquet.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/repo_git.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/repo_local.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/repo_pypi.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/storage_aws.py

@@ -1,8 +1,9 @@
-#  Copyright 2022 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/storage_azure.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/storage_gcp.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #

tracdap/rt/_plugins/storage_local.py

@@ -1,8 +1,9 @@
-#  Copyright 2023 Accenture Global Solutions Limited
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#  Licensed to the Fintech Open Source Foundation (FINOS) under one or
+#  more contributor license agreements. See the NOTICE file distributed
+#  with this work for additional information regarding copyright ownership.
+#  FINOS licenses this file to you under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with the
+#  License. You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #