opentf-toolkit-nightly 0.58.0.dev1144__py3-none-any.whl → 0.58.0.dev1147__py3-none-any.whl

opentf/commons/pubsub.py

@@ -14,7 +14,7 @@
 
 """Helpers for the OpenTestFactory subscription and publication API."""
 
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 import sys
 import threading
@@ -134,8 +134,8 @@ def subscribe(
     app,
     labels: Optional[Dict[str, str]] = None,
     fields: Optional[Dict[str, str]] = None,
-    expressions: Optional[Dict[str, Any]] = None,
-    fieldexpressions: Optional[Dict[str, Any]] = None,
+    expressions: Optional[List[Dict[str, Any]]] = None,
+    fieldexpressions: Optional[List[Dict[str, Any]]] = None,
 ) -> str:
     """Subscribe on specified endpoint.
 

opentf/schemas/opentestfactory.org/v1/Subscription.json

@@ -44,7 +44,7 @@
                             "additionalProperties": false
                         },
                         "matchExpressions": {
-                            "$ref": "#/definitions/expressions"
+                            "$ref": "#/definitions/labelexpressions"
                         },
                         "matchFields": {
                             "type": "object",
@@ -57,7 +57,7 @@
                             "additionalProperties": false
                         },
                         "matchFieldExpressions": {
-                            "$ref": "#/definitions/expressions"
+                            "$ref": "#/definitions/fieldexpressions"
                         }
                     },
                     "minProperties": 1,
@@ -127,58 +127,105 @@
     ],
     "additionalProperties": false,
     "definitions": {
-        "expressions": {
+        "existexpression": {
+            "type": "object",
+            "properties": {
+                "key": {
+                    "type": "string"
+                },
+                "operator": {
+                    "enum": [
+                        "Exists",
+                        "DoesNotExist"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "key",
+                "operator"
+            ]
+        },
+        "inexpression": {
+            "type": "object",
+            "properties": {
+                "key": {
+                    "type": "string"
+                },
+                "operator": {
+                    "enum": [
+                        "In",
+                        "NotIn"
+                    ]
+                },
+                "values": {
+                    "type": "array",
+                    "minItems": 1,
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "key",
+                "operator",
+                "values"
+            ]
+        },
+        "setexpression": {
+            "type": "object",
+            "properties": {
+                "key": {
+                    "type": "string"
+                },
+                "operator": {
+                    "enum": [
+                        "In",
+                        "NotIn",
+                        "ContainsAll",
+                        "DoesNotContainAll"
+                    ]
+                },
+                "values": {
+                    "type": "array",
+                    "minItems": 1,
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "key",
+                "operator",
+                "values"
+            ]
+        },
+        "fieldexpressions": {
             "type": "array",
             "minItems": 1,
             "items": {
                 "anyOf": [
                     {
-                        "type": "object",
-                        "properties": {
-                            "key": {
-                                "type": "string"
-                            },
-                            "operator": {
-                                "enum": [
-                                    "In",
-                                    "NotIn",
-                                    "ContainsAll",
-                                    "DoesNotContainAll"
-                                ]
-                            },
-                            "values": {
-                                "type": "array",
-                                "minItems": 1,
-                                "items": {
-                                    "type": "string"
-                                }
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "key",
-                            "operator",
-                            "values"
-                        ]
+                        "$ref": "#/definitions/setexpression"
                     },
                     {
-                        "type": "object",
-                        "properties": {
-                            "key": {
-                                "type": "string"
-                            },
-                            "operator": {
-                                "enum": [
-                                    "Exists",
-                                    "DoesNotExist"
-                                ]
-                            }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "key",
-                            "operator"
-                        ]
+                        "$ref": "#/definitions/existexpression"
+                    }
+                ]
+            }
+        },
+        "labelexpressions": {
+            "type": "array",
+            "minItems": 1,
+            "items": {
+                "anyOf": [
+                    {
+                        "$ref": "#/definitions/inexpression"
+                    },
+                    {
+                        "$ref": "#/definitions/existexpression"
                     }
                 ]
             }

{opentf_toolkit_nightly-0.58.0.dev1144.dist-info → opentf_toolkit_nightly-0.58.0.dev1147.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentf-toolkit-nightly
-Version: 0.58.0.dev1144
+Version: 0.58.0.dev1147
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix

{opentf_toolkit_nightly-0.58.0.dev1144.dist-info → opentf_toolkit_nightly-0.58.0.dev1147.dist-info}/RECORD

@@ -3,7 +3,7 @@ opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
 opentf/commons/config.py,sha256=dyus4K5Zdmcftc3Y9Z1YRkzA1KwiRLHoeAlg2_A49QM,7876
 opentf/commons/datasources.py,sha256=GSbjrYnZQup2B3r7T7l3C_o6R2jS13nQiu6dRitoenk,26194
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
-opentf/commons/pubsub.py,sha256=kHJggZZnoibx31r9NzTd6tyCjHO2NJlr_q1UY4fVwCQ,7567
+opentf/commons/pubsub.py,sha256=S5_20XhrVKJ5ZXFFBg90qlhbG3PZ_H3Mu1hbS1vpy1U,7585
 opentf/commons/schemas.py,sha256=cjyPXRhRIPQauCdy9zGRaOkqdVcklz47JnljTTLNpq8,4254
 opentf/commons/selectors.py,sha256=DEpLgRAr5HXSpSYI4liXP2hLUTvOSexFa9Vfa1xIQTk,7134
 opentf/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,7 +12,7 @@ opentf/schemas/opentestfactory.org/v1/ExecutionCommand.json,sha256=UtmAlTaYdPSZD
 opentf/schemas/opentestfactory.org/v1/GeneratorResult.json,sha256=sOwieyDWi6UZR7X29R9IjOR87ruSRQ4U6CM2_yT81Zk,16607
 opentf/schemas/opentestfactory.org/v1/ProviderCommand.json,sha256=EU4kvEKxlqpH2IkLZ1HdBealuG6C0YzPkAtI7dNrfHg,4427
 opentf/schemas/opentestfactory.org/v1/ProviderResult.json,sha256=Ej4zhCE3rCqCGKcaeAoIHwSJTV_7fw-rAxhJ52qA-Gs,9641
-opentf/schemas/opentestfactory.org/v1/Subscription.json,sha256=ULD4s-PViRAHUt_iHnvzpQAxONjGW95hXB4tvMS8u_E,6341
+opentf/schemas/opentestfactory.org/v1/Subscription.json,sha256=hNaCUW3qSqqa1LY01Ao7kQ8FJhkjkwMrrPf4xihgSt4,7150
 opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=WAFvCAIxmp22-AN1wPuOkd3BYs8UP5u3hj74NnlO3vU,22945
 opentf/schemas/opentestfactory.org/v1/WorkflowCanceled.json,sha256=BCWxnm3rt4VWh9GXkIhdNY9JYohFWxi9Wg3JjXIavaU,1694
 opentf/schemas/opentestfactory.org/v1/WorkflowCancellation.json,sha256=HAtc8xjrr-WwXwIck9B86BrHELkCb1oPYhTsRzHMMOE,1993
@@ -57,8 +57,8 @@ opentf/scripts/startup.py,sha256=c5fhYUy_Nk6z-eo0kW0mG56452dcIw9mzb9trljZYZ4,214
 opentf/toolkit/__init__.py,sha256=mYeJPZ92ulbTBItqEsZgF4nnuRh6G19QPY3Jxc92ifc,23028
 opentf/toolkit/channels.py,sha256=6xcVKHUK2FdyVKIQmPQbakngfVuQDzCcD_lInOdKpro,17171
 opentf/toolkit/core.py,sha256=6nud1vqcfjs9swZu_Z-rbvdbejtrlSjOd8eZXIF0ChE,9795
-opentf_toolkit_nightly-0.58.0.dev1144.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.58.0.dev1144.dist-info/METADATA,sha256=aw6HxZ-BdUC88HFnFuTYMtjBi-jU-3n48YVykNCkuik,1946
-opentf_toolkit_nightly-0.58.0.dev1144.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-opentf_toolkit_nightly-0.58.0.dev1144.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.58.0.dev1144.dist-info/RECORD,,
+opentf_toolkit_nightly-0.58.0.dev1147.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.58.0.dev1147.dist-info/METADATA,sha256=u7bPmoxzU3wj1MPl0a1Mxx1XS8E6GIk3sjP1Y0UNnTQ,1946
+opentf_toolkit_nightly-0.58.0.dev1147.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+opentf_toolkit_nightly-0.58.0.dev1147.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.58.0.dev1147.dist-info/RECORD,,