crossplane-function-pythonic 0.6.1__py3-none-any.whl → 0.6.2__py3-none-any.whl

crossplane/pythonic/__about__.py

@@ -1,2 +1,2 @@
 # This is set at build time, using "hatch version"
-__version__ = "0.6.1"
+__version__ = "0.6.2"

crossplane/pythonic/composite.py

@@ -112,6 +112,7 @@ class BaseComposite:
         self.context = self.response.context
         self.environment = self.context['apiextensions.crossplane.io/environment']
         self.requireds = Requireds(self)
+        self.watched = self.requireds['ops.crossplane.io/watched-resource'][0]
         self.schemas = Schemas(self)
         self.resources = Resources(self)
         self.autoReady = True

crossplane/pythonic/function.py

@@ -43,19 +43,26 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
 
     async def run_function(self, request):
         composite = request.observed.composite.resource
-        name = list(reversed(composite['apiVersion'].split('/')[0].split('.')))
-        name.append(composite['kind'])
-        name.append(composite['metadata']['name'])
-        logger = logging.getLogger('.'.join(name))
-
-        if 'inlined' in request.input and request.input['inlined']:
-            if 'spec' not in composite or request.input['inlined'] not in composite['spec']:
-                return self.fatal(request, logger, f"Missing inlined spec.{request.input['inlined']}")
-            composite = composite['spec'][request.input['inlined']]
+        if composite and composite.fields:
+            name = list(reversed(composite['apiVersion'].split('/')[0].split('.')))
+            name.append(composite['kind'])
+            name.append(composite['metadata']['name'])
+            logger = logging.getLogger('.'.join(name))
+            if 'inlined' in request.input and request.input['inlined']:
+                if 'spec' not in composite or request.input['inlined'] not in composite['spec']:
+                    return self.fatal(request, logger, f"Missing inlined spec.{request.input['inlined']}")
+                composite = composite['spec'][request.input['inlined']]
+            else:
+                if 'composite' not in request.input:
+                    return self.fatal(request, logger, 'Missing composition input "composite"')
+                composite = request.input['composite']
+            operation = False
         else:
+            logger = logging.getLogger('operation')
             if 'composite' not in request.input:
-                return self.fatal(request, logger, 'Missing input "composite"')
+                return self.fatal(request, logger, 'Missing operation input "composite"')
             composite = request.input['composite']
+            operation = True
 
         # Ideally this is something the Function API provides
         if 'step' in request.input:
@@ -97,6 +104,12 @@ class FunctionRunner(grpcv1.FunctionRunnerService):
                     return self.fatal(request, logger, f"{composite} is not a subclass of BaseComposite")
             self.clazzes[composite] = clazz
 
+        if operation:
+            if '\n' in composite:
+                logger = logging.getLogger(f"operation.{clazz.__name__}")
+            else:
+                logger = logging.getLogger(f"operation.{composite}")
+
         try:
             composite = clazz(self.crossplane_v1, request, logger)
         except Exception as e:

crossplane/pythonic/packages.py

@@ -158,19 +158,23 @@ def package_delete(action, package_dir, package, logger):
 
 def validate_entry(name, value, logger):
     if isinstance(value, str):
-        if not name.endswith('.py'):
-            if '.' in name or '/' in name:
-                logger.error(f"Python package file name is not valid: {name}")
+        if name.endswith('.py'):
+            name = name[:-3]
+            if not name.isidentifier():
+                logger.error(f"Python module name is not an identifier: {name}")
                 return False
-            return True
-        name = name[:-3]
-    elif not isinstance(value, dict):
+        else:
+            if '/' in name:
+                logger.error(f"Python file name is not valid: {name}")
+                return False
+    elif isinstance(value, dict):
+        if not name.isidentifier():
+            logger.error(f"Python package name is not an identifier: {name}")
+            return False
+    else:
         logger.error(f"Python package \"{name}\" value is not a valid type: {value.__class__}")
         return False
-    if name.isidentifier():
-        return True
-    logger.error(f"Python package name is not an identifier: {name}")
-    return False
+    return True
 
 
 def package_file_name(package_name):

crossplane/pythonic/render.py

@@ -287,7 +287,7 @@ class Command(command.Command):
             context[key_value[0]] = protobuf.Yaml(key_value[1])
         return context
 
-    async def render(self, composite, observed=[], composition=None, resources=[], schemas=[], context=None, api=None, render_unknowns=False, crossplane_v1=False, composite_observeds=True):
+    async def render(self, composite, observed=[], composition=None, resources=[], schemas=[], context=None, api=None, render_unknowns=False, crossplane_v1=False, composite_observeds=False):
         # Create the request used when running Composition steps.
         request = protobuf.Message(None, 'request', fnv1.RunFunctionRequest.DESCRIPTOR, fnv1.RunFunctionRequest())
         if context is not None:
@@ -491,7 +491,7 @@ class Command(command.Command):
         for condition in conditions:
             composite.status.conditions[protobuf.append] = condition
 
-        return protobuf.Map(
+        response = protobuf.Map(
             composite=composite,
             connection=protobuf.Map(
                 apiVersion='render.crossplane.io/v1beta1',
@@ -506,6 +506,10 @@ class Command(command.Command):
                 values=request.context,
             ),
         )
+        if composite_observeds:
+            for name, resource in request.observed.resources:
+                response.observed[name] = resource.resource
+        return response
 
     async def get_composite_ref(self, composite, ref, request, resources, api):
         namespace = ref.namespace

{crossplane_function_pythonic-0.6.1.dist-info → crossplane_function_pythonic-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: crossplane-function-pythonic
-Version: 0.6.1
+Version: 0.6.2
 Summary: A Python centric Crossplane Function
 Project-URL: Documentation, https://github.com/crossplane-contrib/function-pythonic#readme
 Project-URL: Issues, https://github.com/crossplane-contrib/function-pythonic/issues
@@ -14,15 +14,15 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: <3.15,>=3.12
-Requires-Dist: grpcio==1.80.0
+Requires-Dist: grpcio==1.83.0
 Requires-Dist: inflect==7.5.0
 Requires-Dist: kr8s==0.20.15
-Requires-Dist: protobuf==7.35.0
+Requires-Dist: protobuf==7.35.1
 Requires-Dist: pyyaml==6.0.3
 Provides-Extra: packages
-Requires-Dist: kopf==1.44.5; extra == 'packages'
+Requires-Dist: kopf==1.44.6; extra == 'packages'
 Provides-Extra: pip-install
-Requires-Dist: pip==26.1.1; extra == 'pip-install'
+Requires-Dist: pip==26.2.1; extra == 'pip-install'
 Description-Content-Type: text/markdown
 
 # function-pythonic
@@ -315,6 +315,7 @@ The BaseComposite also provides access to the following Crossplane Function leve
 | self.context | Map | The response context, initialized from the request context |
 | self.environment | Map | The response environment, initialized from the request context environment |
 | self.requireds | Requireds | Request and read additional local Kubernetes resources |
+| self.watched | RequiredResource | THe WatchOperation's changed resource |
 | self.schemas | Schemas | Request and read CustomResourceDefinition schemas |
 | self.resources | Resources | Define and process composed resources |
 | self.usages| Boolean | Generate Crossplane Usages for resource dependencies, default False |

{crossplane_function_pythonic-0.6.1.dist-info → crossplane_function_pythonic-0.6.2.dist-info}/RECORD

@@ -1,22 +1,22 @@
-crossplane/pythonic/__about__.py,sha256=BmpWZgjXb-VKaTW2Ok13c3aMep0Fd7G8hL8yn1f5Ak0,73
+crossplane/pythonic/__about__.py,sha256=lp1cncWqqXnp4alb9n5yMYyDvn1-wYEyjOf2hb-LSkU,73
 crossplane/pythonic/__init__.py,sha256=cRk12kc18RLhc9s5dW6sQqZSCEp80fooRO5zxXqc1oA,292
 crossplane/pythonic/__main__.py,sha256=6vYRlYDJtqFgLyiTamnl3htiNOtz8QlDl5WlIP98I8o,31
 crossplane/pythonic/auto_ready.py,sha256=sPetUuJRhwZbg9muaDmbdqmtTIIUDmY4qoadoJA0EtQ,7201
 crossplane/pythonic/command.py,sha256=aT58WBrhU_scaOGeqmsBfofIDnXyW1CQOpCktVGBj5s,4211
-crossplane/pythonic/composite.py,sha256=jEMXPy9PchOLZxWDGq5ni6lq3g9guItU5hMZi98ZO34,34440
-crossplane/pythonic/function.py,sha256=sea1BJ9_lOPlhYyD8tO9PV6ieeRb-iQOeez07pG2vZk,18535
+crossplane/pythonic/composite.py,sha256=Ckfma16upi7Kb9J2wTANzUO_493FAL_tjxeKYRTvMaQ,34519
+crossplane/pythonic/function.py,sha256=wJv6NRIqQiY3Nbm4on8zJa-UOBkRShnnrb-3S4lJ8Hg,19170
 crossplane/pythonic/grpc.py,sha256=F3BrfjISGRS2TKeoxUjWeA1LopBaFlZ6nCq_Hei4Di8,5681
 crossplane/pythonic/main.py,sha256=ujUa_FYElQSGqnhZ-0NJrD3kSyYjfRbIp79FV2Yl7hs,599
-crossplane/pythonic/packages.py,sha256=cOlF-wo2CzknwFPAfuwgCiwdT5vDE4n7oBMfQErVzbA,7023
+crossplane/pythonic/packages.py,sha256=xUXJwcG9VFQPNXLJbhdLelUxLehXVATxpehgux03FM8,7166
 crossplane/pythonic/protobuf.py,sha256=1Yj8Cgku0w0UYU3dOh6QIaE8HFtkdkhL9b5UERzwAQ0,53978
-crossplane/pythonic/render.py,sha256=lz65rwcg3EvzdWMTUMMA6PvSHqMVTTkrEK11lLe-0XY,33804
+crossplane/pythonic/render.py,sha256=hv1WOheBx7pXjUwuO17N7aS_qG0mWWu72xt7WzaMXxg,33987
 crossplane/pythonic/version.py,sha256=-RiB0p146ayqJj0SXfYxTNv49u9Fx9pPgm59Ji2blhc,214
 crossplane/pythonic/proto/v1/run_function.proto,sha256=GbJ0wVUEjfpMsn2DsnhiPvtmL09z3oyMbWwf6viQtiw,16676
 crossplane/pythonic/proto/v1/run_function_pb2.py,sha256=adoDilRP8JNSsNWtvLQv8egrlnmpnZk8qbo3REMR8EY,14440
 crossplane/pythonic/proto/v1/run_function_pb2.pyi,sha256=MvjcY39d1xJ4ZZmRibhehCKF1mHVGb6qfpoCQO8XYqE,14374
 crossplane/pythonic/proto/v1/run_function_pb2_grpc.py,sha256=mwfE6i_TQHEfh-KemCT10fKA6jlyZ1A0Ih1z6nELkXk,3968
-crossplane_function_pythonic-0.6.1.dist-info/METADATA,sha256=4RBD7g6NimpRSnPQ_qj54B7-k4uk8iSH5Xc7EzHOFfQ,36686
-crossplane_function_pythonic-0.6.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-crossplane_function_pythonic-0.6.1.dist-info/entry_points.txt,sha256=jJ4baywFDviB9WyAhyhNYF2VOCb6XtbRSjKf7bnBwhg,68
-crossplane_function_pythonic-0.6.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-crossplane_function_pythonic-0.6.1.dist-info/RECORD,,
+crossplane_function_pythonic-0.6.2.dist-info/METADATA,sha256=W6QDxA8GUWQ7CJEzKdqsnjEHJyKfXCs8mOG1O3W3vxY,36762
+crossplane_function_pythonic-0.6.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+crossplane_function_pythonic-0.6.2.dist-info/entry_points.txt,sha256=jJ4baywFDviB9WyAhyhNYF2VOCb6XtbRSjKf7bnBwhg,68
+crossplane_function_pythonic-0.6.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+crossplane_function_pythonic-0.6.2.dist-info/RECORD,,

{crossplane_function_pythonic-0.6.1.dist-info → crossplane_function_pythonic-0.6.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.32.0
 Root-Is-Purelib: true
 Tag: py3-none-any