afp-sdk 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

afp/schemas.py

@@ -1,6 +1,7 @@
 """AFP data structures."""
 
 from decimal import Decimal
+from itertools import chain
 from typing import Annotated, Any, ClassVar, Literal, Self
 
 from pydantic import AfterValidator, BeforeValidator, Field, model_validator
@@ -321,9 +322,17 @@ class PredictionProduct(Model):
             self.product.min_price,
             self.product.max_price,
         )
-        validators.validate_outcome_space_conditions(
-            self.outcome_space.base_case.condition,
-            [case.condition for case in self.outcome_space.edge_cases],
+        validators.validate_outcome_space_template_variables(
+            [
+                self.outcome_space.base_case.condition,
+                self.outcome_space.base_case.fsp_resolution,
+            ]
+            + list(
+                chain.from_iterable(
+                    [edge_case.condition, edge_case.fsp_resolution]
+                    for edge_case in self.outcome_space.edge_cases
+                )
+            ),
             self.outcome_point.model_dump(),
         )
         if isinstance(self.outcome_space, OutcomeSpaceTimeSeries) and isinstance(

afp/validators.py

@@ -3,7 +3,7 @@ from datetime import date, datetime, timedelta
 from decimal import Decimal
 from functools import reduce
 from operator import getitem
-from typing import Any
+from typing import Any, Iterable
 
 import requests
 from binascii import Error
@@ -178,23 +178,23 @@ def validate_oracle_fallback_fsp(
         )
 
 
-def validate_outcome_space_conditions(
-    base_case_condition: str,
-    edge_case_conditions: list[str],
-    outcome_point_dict: dict[Any, Any],
+def validate_outcome_space_template_variables(
+    values: Iterable[str], outcome_point_dict: dict[Any, Any]
 ) -> None:
-    conditions = [base_case_condition] + edge_case_conditions
-    schemas = ["BaseCaseResolution"] + [
-        f"EdgeCase[{i}]" for i in range(len(edge_case_conditions))
-    ]
-    for condition, schema in zip(conditions, schemas):
-        for variable in re.findall(r"{(.+?)}", condition):
-            parts = variable.split(".")
+    for value in values:
+        for variable in re.findall(r"{(.*?)}", value):
             try:
-                reduce(getitem, parts, outcome_point_dict)
-            except KeyError:
+                referred_value = reduce(
+                    getitem, variable.split("."), outcome_point_dict
+                )
+            except (TypeError, KeyError):
+                raise ValueError(
+                    f"OutcomeSpace: Invalid template variable '{variable}'"
+                )
+            if isinstance(referred_value, dict) or isinstance(referred_value, list):  # type: ignore
                 raise ValueError(
-                    f"{schema}: condition: Invalid template variable '{variable}'"
+                    f"OutcomeSpace: Template variable '{variable}' "
+                    "should not refer to a nested object or list"
                 )
 
 

{afp_sdk-0.6.0.dist-info → afp_sdk-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: afp-sdk
-Version: 0.6.0
+Version: 0.6.1
 Summary: Autonomous Futures Protocol Python SDK
 Keywords: autonity,web3,trading,crypto,prediction,forecast,markets
 License-Expression: MIT
@@ -256,8 +256,10 @@ tx = product.register(
 )
 ```
 
-See further code examples in the [examples](./examples/) directory.
+See further code examples in the
+[examples](https://github.com/autonity/afp-sdk/tree/master/examples/) directory.
 
 ## Development
 
-See [DEVELOPMENT.md](./DEVELOPMENT.md) for developer documentation.
+See [DEVELOPMENT.md](https://github.com/autonity/afp-sdk/blob/master/DEVELOPMENT.md)
+for developer documentation.

{afp_sdk-0.6.0.dist-info → afp_sdk-0.6.1.dist-info}/RECORD

@@ -41,10 +41,10 @@ afp/json-schemas/bafyreifcec2km7hxwq6oqzjlspni2mgipetjb7pqtaewh2efislzoctboi.jso
 afp/json-schemas/bafyreihn3oiaxffe4e2w7pwtreadpw3obfd7gqlogbcxm56jc2hzfvco74.json,sha256=_tEqw3mqsdUP_sFwr8S1QZCbXxd3yJYjCHRuYnvoV2Y,4343
 afp/json-schemas/bafyreihur3dzwhja6uxsbcw6eeoj3xmmc4e3zkmyzpot5v5dleevxe5zam.json,sha256=q-JNlC9Znh983Lp0qU8RYdj7VMtKCo4QRUS9OzchEeE,1427
 afp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-afp/schemas.py,sha256=JuddhBffOCRn3xyJRfM7uULziLdE0m1Urd3TOsKur90,9174
+afp/schemas.py,sha256=Qqjkx9IoKJPni_Tup_cgBPTTVfyfexyAjAe5CAU75RM,9456
 afp/types.py,sha256=mI_PFMlVQvP9BJ50jzgvmUQPhTuP7TPP-JQOLvJr6mY,4691
-afp/validators.py,sha256=h_XXLblQ4PdhPpiKk6V2PqSfqEFvEBZm5-6ne3Lkj9w,9170
-afp_sdk-0.6.0.dist-info/licenses/LICENSE,sha256=ZdaKItgc2ppfqta2OJV0oHpSJiK87PUxmUkUo-_0SB8,1065
-afp_sdk-0.6.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-afp_sdk-0.6.0.dist-info/METADATA,sha256=GZ5nR6q0VsCq3ggir78Fmg4XISfVrB73oo14ip8YsTg,8015
-afp_sdk-0.6.0.dist-info/RECORD,,
+afp/validators.py,sha256=ogUzfJcqOsjosP0KncbxfbWVAOcjwEsE3LMmK4aeBFI,9256
+afp_sdk-0.6.1.dist-info/licenses/LICENSE,sha256=ZdaKItgc2ppfqta2OJV0oHpSJiK87PUxmUkUo-_0SB8,1065
+afp_sdk-0.6.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+afp_sdk-0.6.1.dist-info/METADATA,sha256=S286Fl-xYd50GYH4HnY_XdNXwi15IvXzICi15KvQKb0,8107
+afp_sdk-0.6.1.dist-info/RECORD,,