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

crossplane/pythonic/grpc.py

@@ -1,4 +1,4 @@
-
+import argparse
 import asyncio
 import logging
 import os
@@ -16,88 +16,98 @@ from . import (
 )
 from .proto.v1 import run_function_pb2_grpc as grpcv1
 
-
 logger = logging.getLogger(__name__)
 
 
 class Command(command.Command):
-    name = 'grpc'
-    help = 'Run function-pythonic gRPC server'
+    name = "grpc"
+    help = "Run function-pythonic gRPC server"
 
     @classmethod
-    def add_parser_arguments(cls, parser):
+    def add_parser_arguments(cls, parser: argparse.ArgumentParser) -> None:
         cls.add_function_arguments(parser)
         parser.add_argument(
-            '--address',
-            default='0.0.0.0:9443',
-            help='Address to listen on for gRPC connections, default: 0.0.0.0:9443',
+            "--address",
+            default="0.0.0.0:9443",
+            help="Address to listen on for gRPC connections, default: 0.0.0.0:9443",
         )
         parser.add_argument(
-            '--tls-certs-dir',
-            default=os.getenv('TLS_SERVER_CERTS_DIR'),
-            metavar='DIRECTORY',
-            help='Serve using TLS certificates.',
+            "--tls-certs-dir",
+            default=os.getenv("TLS_SERVER_CERTS_DIR"),
+            metavar="DIRECTORY",
+            help="Serve using TLS certificates.",
         )
         parser.add_argument(
-            '--insecure',
-            action='store_true',
-            help='Run without mTLS credentials, --tls-certs-dir will be ignored.',
+            "--insecure",
+            action="store_true",
+            help="Run without mTLS credentials, --tls-certs-dir will be ignored.",
         )
         parser.add_argument(
-            '--packages',
-            action='store_true',
-            dest='packages_configmaps',
-            help='Discover python packages from function-pythonic ConfigMaps, deprecated use --packages-configmaps'
+            "--packages",
+            action="store_true",
+            dest="packages_configmaps",
+            help="Discover python packages from function-pythonic ConfigMaps, deprecated use --packages-configmaps",
         )
         parser.add_argument(
-            '--packages-configmaps',
-            action='store_true',
-            help='Discover python packages from function-pythonic ConfigMaps.'
+            "--packages-configmaps",
+            action="store_true",
+            help="Discover python packages from function-pythonic ConfigMaps.",
         )
         parser.add_argument(
-            '--packages-secrets',
-            action='store_true',
-            help='Also Discover python packages from function-pythonic Secrets.'
+            "--packages-secrets",
+            action="store_true",
+            help="Also Discover python packages from function-pythonic Secrets.",
         )
         parser.add_argument(
-            '--packages-namespace',
-            action='append',
+            "--packages-namespace",
+            action="append",
             default=[],
-            metavar='NAMESPACE',
-            help='Namespaces to discover function-pythonic ConfigMaps and Secrets in, default is cluster wide.',
+            metavar="NAMESPACE",
+            help="Namespaces to discover function-pythonic ConfigMaps and Secrets in, default is cluster wide.",
         )
         parser.add_argument(
-            '--packages-environmentconfigs',
-            action='store_true',
-            help='Also Discover python packages from function-pythonic EnvironmentConfigs.'
+            "--packages-environmentconfigs",
+            action="store_true",
+            help="Also Discover python packages from function-pythonic EnvironmentConfigs.",
         )
         parser.add_argument(
-            '--packages-compositions',
-            action='store_true',
-            help='Also Discover python packages from function-pythonic Compositions.'
+            "--packages-compositions",
+            action="store_true",
+            help="Also Discover python packages from function-pythonic Compositions.",
         )
         parser.add_argument(
-            '--packages-dir',
-            default='./pythonic-packages',
-            metavar='DIRECTORY',
-            help='Directory to store discovered function-pythonic ConfigMaps to, defaults "<cwd>/pythonic-packages"'
+            "--packages-dir",
+            default="./pythonic-packages",
+            metavar="DIRECTORY",
+            help='Directory to store discovered function-pythonic ConfigMaps to, defaults "<cwd>/pythonic-packages"',
         )
         parser.add_argument(
-            '--pip-install',
-            metavar='INSTALL',
-            help='Pip install command to install additional Python packages.'
+            "--pip-install",
+            metavar="INSTALL",
+            help="Pip install command to install additional Python packages.",
         )
 
-    def initialize(self):
+    def initialize(self) -> None:
         if not self.args.tls_certs_dir and not self.args.insecure:
-            print('Either --tls-certs-dir or --insecure must be specified', file=sys.stderr)
+            print(
+                "Either --tls-certs-dir or --insecure must be specified",
+                file=sys.stderr,
+            )
             sys.exit(1)
-        if (self.args.packages_environmentconfigs or self.args.packages_compositions) and self.args.packages_namespace:
-            print('--packages-namespace cannot be used with --packages-environment-configs or --packages-compositions', file=sys.stderr)
+        if (
+            self.args.packages_environmentconfigs or self.args.packages_compositions
+        ) and self.args.packages_namespace:
+            print(
+                "--packages-namespace cannot be used with --packages-environment-configs or --packages-compositions",
+                file=sys.stderr,
+            )
             sys.exit(1)
         if self.args.pip_install:
             import pip._internal.cli.main
-            pip._internal.cli.main.main(['install', '--user', *shlex.split(self.args.pip_install)])
+
+            pip._internal.cli.main.main(
+                ["install", "--user", *shlex.split(self.args.pip_install)]
+            )
 
         self.initialize_function()
         logger.info(f"Version: {__about__.__version__}")
@@ -105,9 +115,11 @@ class Command(command.Command):
         # enables read only volumes or mismatched uid volumes
         sys.dont_write_bytecode = True
 
-    async def run(self):
+    async def run(self) -> None:
         grpc.aio.init_grpc_aio()
-        grpc_runner = function.FunctionRunner(self.args.render_unknowns, self.args.crossplane_v1)
+        grpc_runner = function.FunctionRunner(
+            self.args.render_unknowns, self.args.crossplane_v1
+        )
         grpc_server = grpc.aio.server()
         grpcv1.add_FunctionRunnerServiceServicer_to_server(grpc_runner, grpc_server)
         if self.args.insecure:
@@ -117,33 +129,45 @@ class Command(command.Command):
             grpc_server.add_secure_port(
                 self.args.address,
                 grpc.ssl_server_credentials(
-                    private_key_certificate_chain_pairs=[(
-                        (certs / 'tls.key').read_bytes(),
-                        (certs / 'tls.crt').read_bytes(),
-                    )],
-                    root_certificates=(certs / 'ca.crt').read_bytes(),
+                    private_key_certificate_chain_pairs=[
+                        (
+                            (certs / "tls.key").read_bytes(),
+                            (certs / "tls.crt").read_bytes(),
+                        )
+                    ],
+                    root_certificates=(certs / "ca.crt").read_bytes(),
                     require_client_auth=True,
                 ),
             )
         await grpc_server.start()
 
-        if self.args.packages_configmaps or self.args.packages_secrets or self.args.packages_environmentconfigs or self.args.packages_compositions:
+        if (
+            self.args.packages_configmaps
+            or self.args.packages_secrets
+            or self.args.packages_environmentconfigs
+            or self.args.packages_compositions
+        ):
             from . import packages
+
             async with asyncio.TaskGroup() as tasks:
                 tasks.create_task(grpc_server.wait_for_termination())
-                tasks.create_task(packages.operator(
-                    grpc_server,
-                    grpc_runner,
-                    self.args.packages_configmaps,
-                    self.args.packages_secrets,
-                    self.args.packages_namespace,
-                    self.args.packages_environmentconfigs,
-                    self.args.packages_compositions,
-                    self.args.packages_dir,
-                ))
+                tasks.create_task(
+                    packages.operator(
+                        grpc_server,
+                        grpc_runner,
+                        self.args.packages_configmaps,
+                        self.args.packages_secrets,
+                        self.args.packages_namespace,
+                        self.args.packages_environmentconfigs,
+                        self.args.packages_compositions,
+                        self.args.packages_dir,
+                    )
+                )
         else:
+
             def stop():
                 asyncio.ensure_future(grpc_server.stop(5))
+
             loop = asyncio.get_event_loop()
             loop.add_signal_handler(signal.SIGINT, stop)
             loop.add_signal_handler(signal.SIGTERM, stop)

crossplane/pythonic/main.py

@@ -3,6 +3,15 @@
 import argparse
 import asyncio
 import sys
+import warnings
+
+# kr8s emits this at import time, so filter before importing it.
+warnings.filterwarnings(
+    "ignore",
+    message="'asyncio.iscoroutinefunction' is deprecated",
+    category=DeprecationWarning,
+    module="kr8s._vendored.asyncache",
+)
 
 from . import (
     grpc,
@@ -12,17 +21,21 @@ from . import (
 
 
 def main():
-    parser = argparse.ArgumentParser('Crossplane Function Pythonic')
-    subparsers = parser.add_subparsers(title='Command', metavar='')
+    parser: argparse.ArgumentParser = argparse.ArgumentParser(
+        "Crossplane Function Pythonic"
+    )
+    subparsers: argparse._SubParsersAction[argparse.ArgumentParser] = (
+        parser.add_subparsers(title="Command", metavar="")
+    )
     grpc.Command.create(subparsers)
     render.Command.create(subparsers)
     version.Command.create(subparsers)
-    args = parser.parse_args()
-    if not hasattr(args, 'command'):
+    args: argparse.Namespace = parser.parse_args()
+    if not hasattr(args, "command"):
         parser.print_help()
         sys.exit(1)
     asyncio.run(args.command(args).run())
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

crossplane/pythonic/packages.py

@@ -1,42 +1,54 @@
-
 import base64
 import logging
 import pathlib
 import sys
+import typing
 
+import grpc
 import kopf
 
+from . import function
 
 GRPC_SERVER = None
 GRPC_RUNNER = None
 PACKAGES_DIR = None
-PACKAGE_LABEL = 'function-pythonic.package'
+PACKAGE_LABEL = "function-pythonic.package"
 PACKAGE_LABELS = {PACKAGE_LABEL: kopf.PRESENT}
 
 
-def operator(grpc_server, grpc_runner, packages_configmaps, packages_secrets, packages_namespaces, packages_environmentconfigs, packages_compositions, packages_dir):
-    logging.getLogger('kopf.objects').setLevel(logging.INFO)
+def operator(
+    grpc_server: grpc.aio.Server,
+    grpc_runner: function.FunctionRunner,
+    packages_configmaps: bool,
+    packages_secrets: bool,
+    packages_namespaces: list[str],
+    packages_environmentconfigs: bool,
+    packages_compositions: bool,
+    packages_dir: str,
+) -> typing.Coroutine:
+    logging.getLogger("kopf.objects").setLevel(logging.INFO)
     global GRPC_SERVER, GRPC_RUNNER, PACKAGES_DIR
     GRPC_SERVER = grpc_server
     GRPC_RUNNER = grpc_runner
     PACKAGES_DIR = pathlib.Path(packages_dir).expanduser().resolve()
     sys.path.insert(0, str(PACKAGES_DIR))
     if packages_configmaps:
-        on_resource('', 'v1', 'configmaps')
+        on_resource("", "v1", "configmaps")
     if packages_secrets:
-        on_resource('', 'v1', 'secrets')
+        on_resource("", "v1", "secrets")
     if not packages_namespaces:
         if packages_environmentconfigs:
-            on_resource('apiextensions.crossplane.io', 'v1beta1', 'environmentconfigs')
+            on_resource("apiextensions.crossplane.io", "v1beta1", "environmentconfigs")
         if packages_compositions:
-            on_resource('apiextensions.crossplane.io', 'v1', 'compositions')
+            on_resource("apiextensions.crossplane.io", "v1", "compositions")
     return kopf.operator(
         standalone=True,
         clusterwide=not packages_namespaces,
         namespaces=packages_namespaces,
     )
 
-def on_resource(group, version, plural):
+
+def on_resource(group: str, version: str, plural: str):
     kopf.on.create(group, version, plural, labels=PACKAGE_LABELS)(create)
     kopf.on.resume(group, version, plural, labels=PACKAGE_LABELS)(create)
     kopf.on.update(group, version, plural, labels=PACKAGE_LABELS)(update)
@@ -44,52 +56,66 @@ def on_resource(group, version, plural):
 
 
 @kopf.on.startup()
-async def startup(settings, **_):
+async def startup(settings: kopf.OperatorSettings, **_: typing.Any) -> None:
     settings.scanning.disabled = True
 
 
 @kopf.on.cleanup()
-async def cleanup(**_):
-    await GRPC_SERVER.stop(5)
+async def cleanup(**_: typing.Any) -> None:
+    if GRPC_SERVER:
+        await GRPC_SERVER.stop(5)
 
 
-async def create(resource, labels, body, logger, **_):
-    resource_create(resource, labels, 'Created', body, logger)
+async def create(resource, labels, body, logger, **_: typing.Any):
+    resource_create(resource, labels, "Created", body, logger)
 
 
-async def update(resource, labels, body, old, logger, **_):
-    resource_delete(resource, labels, 'Removed', old, logger)
-    resource_create(resource, labels, 'Added', body, logger)
+async def update(resource, labels, body, old, logger, **_: typing.Any):
+    resource_delete(resource, labels, "Removed", old, logger)
+    resource_create(resource, labels, "Added", body, logger)
 
 
-async def delete(resource, labels, body, logger, **_):
-    resource_delete(resource, labels, 'Deleted', body, logger)
+async def delete(resource, labels, body, logger, **_: typing.Any):
+    resource_delete(resource, labels, "Deleted", body, logger)
 
 
 def resource_create(resource, labels, action, body, logger):
     package_dir = resource_package_dir(resource, labels, logger)
     if not package_dir:
         return
-    if resource.plural in ('configmaps', 'secrets', 'environmentconfigs'):
-        package_create(resource, action, package_dir, body.get('data', {}), logger)
-    elif resource.plural == 'compositions':
-        for step in body.get('spec', {}).get('pipeline', []):
-            input = step.get('input')
-            if input and input.get('apiVersion') == 'pythonic.fn.crossplane.io/v1alpha1':
-                package_create(resource, action, package_dir, input.get('packages', {}), logger)
+    if resource.plural in ("configmaps", "secrets", "environmentconfigs"):
+        package_create(resource, action, package_dir, body.get("data", {}), logger)
+    elif resource.plural == "compositions":
+        for step in body.get("spec", {}).get("pipeline", []):
+            input = step.get("input")
+            if (
+                input
+                and input.get("apiVersion") == "pythonic.fn.crossplane.io/v1alpha1"
+            ):
+                package_create(
+                    resource, action, package_dir, input.get("packages", {}), logger
+                )
 
 
 def resource_delete(resource, labels, action, body, logger):
     package_dir = resource_package_dir(resource, labels, logger)
     if not package_dir:
         return
-    if resource.plural in ('configmaps', 'secrets', 'environmentconfigs'):
-        package_delete(action, package_dir, body.get('data', {}), logger)
-    elif resource.plural == 'compositions':
-        for step in body.get('spec', {}).get('pipeline', []):
-            input = step.get('input')
-            if input and input.get('apiVersion') == 'pythonic.fn.crossplane.io/v1alpha1':
-                package_delete(action, package_dir, step.get('input', {}).get('packages', {}), logger)
+    if resource.plural in ("configmaps", "secrets", "environmentconfigs"):
+        package_delete(action, package_dir, body.get("data", {}), logger)
+    elif resource.plural == "compositions":
+        for step in body.get("spec", {}).get("pipeline", []):
+            input = step.get("input")
+            if (
+                input
+                and input.get("apiVersion") == "pythonic.fn.crossplane.io/v1alpha1"
+            ):
+                package_delete(
+                    action,
+                    package_dir,
+                    step.get("input", {}).get("packages", {}),
+                    logger,
+                )
 
 
 def resource_package_dir(resource, labels, logger):
@@ -99,10 +125,10 @@ def resource_package_dir(resource, labels, logger):
             logger.error(f"{PACKAGE_LABEL} label is missing")
         return None
     package_dir = PACKAGES_DIR
-    if resource.plural in ('configmaps', 'secrets') and package:
-        for segment in package.split('.'):
+    if resource.plural in ("configmaps", "secrets") and package:
+        for segment in package.split("."):
             if not segment.isidentifier():
-                logger.error('Package has invalid package name: %s', package)
+                logger.error("Package has invalid package name: %s", package)
                 return None
             package_dir = package_dir / segment
     return package_dir
@@ -114,13 +140,14 @@ def package_create(resource, action, package_dir, package, logger):
             package_name = package_dir / name
             if isinstance(value, str):
                 package_name.parent.mkdir(parents=True, exist_ok=True)
-                if resource.plural == 'secrets':
-                    package_name.write_bytes(base64.b64decode(value.encode('utf-8')))
+                if resource.plural == "secrets":
+                    package_name.write_bytes(base64.b64decode(value.encode("utf-8")))
                 else:
                     package_name.write_text(value)
                 module, name = package_file_name(package_name)
                 if module:
-                    GRPC_RUNNER.invalidate_module(name)
+                    if GRPC_RUNNER:
+                        GRPC_RUNNER.invalidate_module(name)
                     logger.info(f"{action} module: {name}")
                 else:
                     logger.info(f"{action} file: {name}")
@@ -136,20 +163,22 @@ def package_delete(action, package_dir, package, logger):
                 package_name.unlink(missing_ok=True)
                 module, name = package_file_name(package_name)
                 if module:
-                    GRPC_RUNNER.invalidate_module(name)
+                    if GRPC_RUNNER:
+                        GRPC_RUNNER.invalidate_module(name)
                     logger.info(f"{action} module: {name}")
                 else:
                     logger.info(f"{action} file: {name}")
                 parent = package_name.parent
                 while (
-                        parent.is_relative_to(PACKAGES_DIR)
-                        and parent.is_dir()
-                        and not list(parent.iterdir())
+                    parent.is_relative_to(PACKAGES_DIR)
+                    and parent.is_dir()
+                    and not list(parent.iterdir())
                 ):
                     parent.rmdir()
-                    module = str(parent.relative_to(PACKAGES_DIR)).replace('/', '.')
-                    if module != '.':
-                        GRPC_RUNNER.invalidate_module(module)
+                    module = str(parent.relative_to(PACKAGES_DIR)).replace("/", ".")
+                    if module != ".":
+                        if GRPC_RUNNER:
+                            GRPC_RUNNER.invalidate_module(module)
                         logger.info(f"{action} package: {module}")
                     parent = parent.parent
             elif isinstance(value, dict):
@@ -158,13 +187,13 @@ def package_delete(action, package_dir, package, logger):
 
 def validate_entry(name, value, logger):
     if isinstance(value, str):
-        if name.endswith('.py'):
+        if name.endswith(".py"):
             name = name[:-3]
             if not name.isidentifier():
                 logger.error(f"Python module name is not an identifier: {name}")
                 return False
         else:
-            if '/' in name:
+            if "/" in name:
                 logger.error(f"Python file name is not valid: {name}")
                 return False
     elif isinstance(value, dict):
@@ -172,13 +201,15 @@ def validate_entry(name, value, logger):
             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__}")
+        logger.error(
+            f'Python package "{name}" value is not a valid type: {value.__class__}'
+        )
         return False
     return True
 
 
 def package_file_name(package_name):
     name = str(package_name.relative_to(PACKAGES_DIR))
-    if name.endswith('.py'):
-        return True, name[:-3].replace('/', '.')
+    if name.endswith(".py"):
+        return True, name[:-3].replace("/", ".")
     return False, name

crossplane/pythonic/proto/v1/run_function_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: crossplane/pythonic/proto/v1/run_function.proto
-# Protobuf Python Version: 6.31.1
+# Protobuf Python Version: 7.35.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    6,
-    31,
+    7,
+    35,
     1,
     '',
     'crossplane/pythonic/proto/v1/run_function.proto'