json variables

src/prefect/client/schemas/filters.py

@@ -1088,22 +1088,6 @@ class VariableFilterName(PrefectBaseModel):
     )
 
 
-class VariableFilterValue(PrefectBaseModel):
-    """Filter by `Variable.value`."""
-
-    any_: Optional[List[str]] = Field(
-        default=None, description="A list of variables value to include"
-    )
-    like_: Optional[str] = Field(
-        default=None,
-        description=(
-            "A string to match variable value against. This can include "
-            "SQL wildcard characters like `%` and `_`."
-        ),
-        examples=["my-value-%"],
-    )
-
-
 class VariableFilterTags(PrefectBaseModel, OperatorMixin):
     """Filter by `Variable.tags`."""
 
@@ -1129,9 +1113,6 @@ class VariableFilter(PrefectBaseModel, OperatorMixin):
     name: Optional[VariableFilterName] = Field(
         default=None, description="Filter criteria for `Variable.name`"
     )
-    value: Optional[VariableFilterValue] = Field(
-        default=None, description="Filter criteria for `Variable.value`"
-    )
     tags: Optional[VariableFilterTags] = Field(
         default=None, description="Filter criteria for `Variable.tags`"
     )

src/prefect/server/database/migrations/versions/postgresql/2024_05_21_101457_94622c1663e8_json_variables.py

@@ -0,0 +1,66 @@
+"""json_variables
+
+Revision ID: 94622c1663e8
+Revises: b23c83a12cb4
+Create Date: 2024-05-21 10:14:57.246286
+
+"""
+import json
+
+import sqlalchemy as sa
+from alembic import op
+
+from prefect.server.utilities.database import JSON
+
+# revision identifiers, used by Alembic.
+revision = "94622c1663e8"
+down_revision = "b23c83a12cb4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("variable") as batch_op:
+        batch_op.add_column("variable", sa.Column("json_value", JSON, nullable=True))
+
+        conn = batch_op.get_bind()
+
+        result = conn.execute(sa.text("SELECT id, value FROM variable"))
+        rows = result.fetchall()
+
+        for variable_id, value in rows:
+            # these values need to be json compatible strings
+            json_value = json.dumps(value)
+            conn.execute(
+                sa.text("UPDATE variable SET json_value = :json_value WHERE id = :id"),
+                {"json_value": json_value, "id": variable_id},
+            )
+
+        batch_op.drop_column("variable", "value")
+        batch_op.alter_column("variable", "json_value", new_column_name="value")
+
+
+def downgrade():
+    with op.batch_alter_table("variable") as batch_op:
+        batch_op.add_column(
+            "variable", sa.Column("string_value", sa.String, nullable=True)
+        )
+
+        conn = batch_op.get_bind()
+
+        result = conn.execute(sa.text("SELECT id, value FROM variable"))
+        rows = result.fetchall()
+
+        for variable_id, value in rows:
+            string_value = str(value)
+            conn.execute(
+                sa.text(
+                    "UPDATE variable SET string_value = :string_value WHERE id = :id"
+                ),
+                {"string_value": string_value, "id": variable_id},
+            )
+
+        batch_op.drop_column("variable", "value")
+        batch_op.alter_column(
+            "variable", "string_value", new_column_name="value", nullable=False
+        )

src/prefect/server/database/migrations/versions/sqlite/2024_05_21_123101_2ac65f1758c2_json_variables.py

@@ -0,0 +1,58 @@
+"""json_variables
+
+Revision ID: 2ac65f1758c2
+Revises: 20fbd53b3cef
+Create Date: 2024-05-21 12:29:43.948758
+
+"""
+import json
+
+import sqlalchemy as sa
+from alembic import op
+
+from prefect.server.utilities.database import JSON
+
+# revision identifiers, used by Alembic.
+revision = "2ac65f1758c2"
+down_revision = "20fbd53b3cef"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("variable", sa.Column("json_value", JSON, nullable=True))
+
+    conn = op.get_bind()
+
+    result = conn.execute(sa.text("SELECT id, value FROM variable"))
+    rows = result.fetchall()
+
+    for variable_id, value in rows:
+        # these values need to be json compatible strings
+        json_value = json.dumps(value)
+        conn.execute(
+            sa.text("UPDATE variable SET json_value = :json_value WHERE id = :id"),
+            {"json_value": json_value, "id": variable_id},
+        )
+
+    op.drop_column("variable", "value")
+    op.alter_column("variable", "json_value", new_column_name="value")
+
+
+def downgrade():
+    op.add_column("variable", sa.Column("string_value", sa.String, nullable=True))
+
+    conn = op.get_bind()
+
+    result = conn.execute(sa.text("SELECT id, value FROM variable"))
+    rows = result.fetchall()
+
+    for variable_id, value in rows:
+        string_value = str(value)
+        conn.execute(
+            sa.text("UPDATE variable SET string_value = :string_value WHERE id = :id"),
+            {"string_value": string_value, "id": variable_id},
+        )
+
+    op.drop_column("variable", "value")
+    op.alter_column("variable", "string_value", new_column_name="value")

src/prefect/server/database/orm_models.py

@@ -1275,7 +1275,7 @@ class FlowRunNotificationQueue(Base):
 
 class Variable(Base):
     name = sa.Column(sa.String, nullable=False)
-    value = sa.Column(sa.String, nullable=False)
+    value = sa.Column(sa.JSON, nullable=False)
     tags = sa.Column(JSON, server_default="[]", default=list, nullable=False)
 
     __table_args__ = (sa.UniqueConstraint("name"),)

src/prefect/server/schemas/actions.py

@@ -7,7 +7,17 @@
 from typing import Any, Dict, Generator, List, Optional, Union
 from uuid import UUID, uuid4
 
-from pydantic.v1 import Field, HttpUrl, root_validator, validator
+import orjson
+from pydantic.v1 import (
+    Field,
+    HttpUrl,
+    StrictBool,
+    StrictFloat,
+    StrictInt,
+    StrictStr,
+    root_validator,
+    validator,
+)
 
 import prefect.server.schemas as schemas
 from prefect._internal.compatibility.deprecated import DeprecatedInfraOverridesField
@@ -1032,11 +1042,13 @@ class VariableCreate(ActionBaseModel):
         examples=["my-variable"],
         max_length=schemas.core.MAX_VARIABLE_NAME_LENGTH,
     )
-    value: str = Field(
+    value: Union[
+        StrictStr, StrictFloat, StrictBool, StrictInt, None, Dict[str, Any], List[Any]
+    ] = Field(
         default=...,
         description="The value of the variable",
         examples=["my-value"],
-        max_length=schemas.core.MAX_VARIABLE_VALUE_LENGTH,
+        strict=True,
     )
     tags: List[str] = Field(
         default_factory=list,
@@ -1047,6 +1059,20 @@ class VariableCreate(ActionBaseModel):
     # validators
     _validate_name_format = validator("name", allow_reuse=True)(validate_variable_name)
 
+    @validator("value")
+    def validate_value(cls, v):
+        try:
+            json_string = orjson.dumps(v)
+        except orjson.JSONDecodeError:
+            raise ValueError("Variable value must be serializable to JSON.")
+
+        if len(json_string) > schemas.core.MAX_VARIABLE_VALUE_LENGTH:
+            raise ValueError(
+                f"value must less than {schemas.core.MAX_VARIABLE_VALUE_LENGTH} characters when serialized."
+            )
+
+        return v
+
 
 class VariableUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update a Variable."""
@@ -1057,17 +1083,33 @@ class VariableUpdate(ActionBaseModel):
         examples=["my-variable"],
         max_length=schemas.core.MAX_VARIABLE_NAME_LENGTH,
     )
-    value: Optional[str] = Field(
+    value: Union[
+        StrictStr, StrictInt, StrictFloat, StrictBool, None, Dict[str, Any], List[Any]
+    ] = Field(
         default=None,
         description="The value of the variable",
         examples=["my-value"],
-        max_length=schemas.core.MAX_VARIABLE_VALUE_LENGTH,
+        strict=True,
     )
     tags: Optional[List[str]] = Field(
         default=None,
         description="A list of variable tags",
         examples=[["tag-1", "tag-2"]],
     )
 
+    @validator("value")
+    def validate_value(cls, v):
+        try:
+            json_string = orjson.dumps(v)
+        except orjson.JSONDecodeError:
+            raise ValueError("Variable value must be serializable to JSON.")
+
+        if len(json_string) > schemas.core.MAX_VARIABLE_VALUE_LENGTH:
+            raise ValueError(
+                f"value must less than {schemas.core.MAX_VARIABLE_VALUE_LENGTH} characters when serialized."
+            )
+
+        return v
+
     # validators
     _validate_name_format = validator("name", allow_reuse=True)(validate_variable_name)

src/prefect/server/schemas/core.py

@@ -7,7 +7,17 @@
 from uuid import UUID
 
 import pendulum
-from pydantic.v1 import BaseModel, Field, HttpUrl, root_validator, validator
+from pydantic.v1 import (
+    BaseModel,
+    Field,
+    HttpUrl,
+    StrictBool,
+    StrictFloat,
+    StrictInt,
+    StrictStr,
+    root_validator,
+    validator,
+)
 from typing_extensions import Literal, Self
 
 import prefect.server.database
@@ -1203,11 +1213,13 @@ class Variable(ORMBaseModel):
         examples=["my-variable"],
         max_length=MAX_VARIABLE_NAME_LENGTH,
     )
-    value: str = Field(
+    value: Union[
+        StrictStr, StrictFloat, StrictBool, StrictInt, None, Dict[str, Any], List[Any]
+    ] = Field(
         default=...,
         description="The value of the variable",
         examples=["my-value"],
-        max_length=MAX_VARIABLE_VALUE_LENGTH,
+        strict=True,
     )
     tags: List[str] = Field(
         default_factory=list,

src/prefect/server/schemas/filters.py

@@ -2016,30 +2016,6 @@ def _get_filter_list(self) -> List:
         return filters
 
 
-class VariableFilterValue(PrefectFilterBaseModel):
-    """Filter by `Variable.value`."""
-
-    any_: Optional[List[str]] = Field(
-        default=None, description="A list of variables value to include"
-    )
-    like_: Optional[str] = Field(
-        default=None,
-        description=(
-            "A string to match variable value against. This can include "
-            "SQL wildcard characters like `%` and `_`."
-        ),
-        examples=["my-value-%"],
-    )
-
-    def _get_filter_list(self) -> List:
-        filters = []
-        if self.any_ is not None:
-            filters.append(orm_models.Variable.value.in_(self.any_))
-        if self.like_ is not None:
-            filters.append(orm_models.Variable.value.ilike(f"%{self.like_}%"))
-        return filters
-
-
 class VariableFilterTags(PrefectOperatorFilterBaseModel):
     """Filter by `Variable.tags`."""
 
@@ -2079,9 +2055,6 @@ class VariableFilter(PrefectOperatorFilterBaseModel):
     name: Optional[VariableFilterName] = Field(
         default=None, description="Filter criteria for `Variable.name`"
     )
-    value: Optional[VariableFilterValue] = Field(
-        default=None, description="Filter criteria for `Variable.value`"
-    )
     tags: Optional[VariableFilterTags] = Field(
         default=None, description="Filter criteria for `Variable.tags`"
     )
@@ -2093,8 +2066,6 @@ def _get_filter_list(self) -> List:
             filters.append(self.id.as_sql_filter())
         if self.name is not None:
             filters.append(self.name.as_sql_filter())
-        if self.value is not None:
-            filters.append(self.value.as_sql_filter())
         if self.tags is not None:
             filters.append(self.tags.as_sql_filter())
         return filters