diff --git a/src/ui/src/core_components/input/CoreTimeInput.vue b/src/ui/src/core_components/input/CoreTimeInput.vue
new file mode 100644
index 000000000..c64289dd5
--- /dev/null
+++ b/src/ui/src/core_components/input/CoreTimeInput.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/ui/src/core_components/layout/CoreStep.vue b/src/ui/src/core_components/layout/CoreStep.vue
index fc3fe6a83..25076eb42 100644
--- a/src/ui/src/core_components/layout/CoreStep.vue
+++ b/src/ui/src/core_components/layout/CoreStep.vue
@@ -275,6 +275,15 @@ watch([isStepActive, fields.isCompleted], () => {
}
});
+/*
+Activate any step that was previously complete but switched to non-completed.
+*/
+watch(fields.isCompleted, (value: string, oldValue: string) => {
+ if (oldValue !== "yes") return;
+ if (value !== "no") return;
+ activateDefaultStep();
+});
+
onBeforeMount(() => {
if (
stepContainerDirectChildInstanceItem?.value.instanceNumber ==
diff --git a/src/ui/src/fonts.ts b/src/ui/src/fonts.ts
new file mode 100644
index 000000000..64394e08b
--- /dev/null
+++ b/src/ui/src/fonts.ts
@@ -0,0 +1,12 @@
+import "@fontsource-variable/material-symbols-outlined";
+
+import "@fontsource/poppins/300-italic.css";
+import "@fontsource/poppins/300.css";
+import "@fontsource/poppins/400-italic.css";
+import "@fontsource/poppins/400.css";
+import "@fontsource/poppins/500-italic.css";
+import "@fontsource/poppins/500.css";
+import "@fontsource/poppins/600-italic.css";
+import "@fontsource/poppins/600.css";
+import "@fontsource/poppins/700-italic.css";
+import "@fontsource/poppins/700.css";
diff --git a/src/ui/src/main.ts b/src/ui/src/main.ts
index 259868ddc..2afdf72b7 100644
--- a/src/ui/src/main.ts
+++ b/src/ui/src/main.ts
@@ -1,9 +1,10 @@
import * as vue from "vue";
import { App, createApp } from "vue";
-import injectionKeys from "./injectionKeys";
-import { generateCore } from "./core";
-import { generateBuilderManager } from "./builder/builderManager.js";
import VueDOMPurifyHTML from "vue-dompurify-html";
+import { generateBuilderManager } from "./builder/builderManager.js";
+import { generateCore } from "./core";
+import "./fonts";
+import injectionKeys from "./injectionKeys";
/**
* RemixIcon by remixicon.com
diff --git a/src/ui/src/renderer/useEvaluator.ts b/src/ui/src/renderer/useEvaluator.ts
index ebb39642c..d402efad8 100644
--- a/src/ui/src/renderer/useEvaluator.ts
+++ b/src/ui/src/renderer/useEvaluator.ts
@@ -111,7 +111,6 @@ export function useEvaluator(wf: Core) {
instancePath: InstancePath,
): string {
if (template === undefined || template === null) return "";
-
const evaluatedTemplate = template.replace(
templateRegex,
(match, captured) => {
diff --git a/src/writer/ai.py b/src/writer/ai.py
index 5e5e0c5a4..ae9655de2 100644
--- a/src/writer/ai.py
+++ b/src/writer/ai.py
@@ -1,31 +1,58 @@
import logging
-from typing import Generator, Iterable, List, Literal, Optional, TypedDict, Union, cast
+from datetime import datetime
+from typing import (
+ Generator,
+ Iterable,
+ List,
+ Literal,
+ Optional,
+ Set,
+ TypedDict,
+ Union,
+ cast,
+)
+from uuid import uuid4
from httpx import Timeout
from writerai import Writer
from writerai._exceptions import WriterError
+from writerai._response import BinaryAPIResponse
from writerai._streaming import Stream
from writerai._types import Body, Headers, NotGiven, Query
-from writerai.types import Chat, Completion, StreamingData
+from writerai.resources import FilesResource, GraphsResource
+from writerai.types import (
+ Chat,
+ Completion,
+ FileDeleteResponse,
+ GraphDeleteResponse,
+ GraphRemoveFileFromGraphResponse,
+ GraphUpdateResponse,
+ StreamingData,
+)
+from writerai.types import File as SDKFile
+from writerai.types import Graph as SDKGraph
from writerai.types.chat_chat_params import Message as WriterAIMessage
from writer.core import get_app_process
-class ChatOptions(TypedDict, total=False):
+class APIOptions(TypedDict, total=False):
+ extra_headers: Optional[Headers]
+ extra_query: Optional[Query]
+ extra_body: Optional[Body]
+ timeout: Union[float, Timeout, None, NotGiven]
+
+
+class ChatOptions(APIOptions, total=False):
model: str
max_tokens: Union[int, NotGiven]
n: Union[int, NotGiven]
stop: Union[List[str], str, NotGiven]
temperature: Union[float, NotGiven]
top_p: Union[float, NotGiven]
- extra_headers: Optional[Headers]
- extra_query: Optional[Query]
- extra_body: Optional[Body]
- timeout: Union[float, Timeout, None, NotGiven]
-class CreateOptions(TypedDict, total=False):
+class CreateOptions(APIOptions, total=False):
model: str
best_of: Union[int, NotGiven]
max_tokens: Union[int, NotGiven]
@@ -33,10 +60,13 @@ class CreateOptions(TypedDict, total=False):
stop: Union[List[str], str, NotGiven]
temperature: Union[float, NotGiven]
top_p: Union[float, NotGiven]
- extra_headers: Optional[Headers]
- extra_query: Optional[Query]
- extra_body: Optional[Body]
- timeout: Union[float, Timeout, None, NotGiven]
+
+
+class APIListOptions(APIOptions, total=False):
+ after: Union[str, NotGiven]
+ before: Union[str, NotGiven]
+ limit: Union[int, NotGiven]
+ order: Union[Literal["asc", "desc"], NotGiven]
logger = logging.Logger(__name__)
@@ -141,6 +171,510 @@ def acquire_client(cls) -> Writer:
return instance.client
+class SDKWrapper:
+ """
+ A wrapper class for SDK objects, allowing dynamic access to properties.
+
+ Attributes:
+ _wrapped (Union[SDKFile, SDKGraph]): The wrapped SDK object.
+ """
+ _wrapped: Union[SDKFile, SDKGraph]
+
+ def _get_property(self, property_name):
+ """
+ Retrieves a property from the wrapped object.
+
+ :param property_name: The name of the property to retrieve.
+ :type property_name: str
+ :returns: The value of the requested property.
+ :raises AttributeError: If the property does not exist.
+ """
+ try:
+ return getattr(self._wrapped, property_name)
+ except AttributeError:
+ raise AttributeError(
+ f"type object '{self.__class__}' has no attribute {property_name}"
+ ) from None
+
+
+class Graph(SDKWrapper):
+ """
+ A wrapper class for SDKGraph objects, providing additional functionality.
+
+ Attributes:
+ _wrapped (writerai.types.Graph): The wrapped SDK Graph object.
+ stale_ids (set): A set of stale graph IDs that need updates.
+ """
+ _wrapped: SDKGraph
+ stale_ids: Set[str] = set()
+
+ def __init__(
+ self,
+ graph_object: SDKGraph
+ ):
+ """
+ Initializes the Graph with the given SDKGraph object.
+
+ :param graph_object: The SDKGraph object to wrap.
+ :type graph_object: writerai.types.Graph
+ """
+ self._wrapped = graph_object
+
+ @staticmethod
+ def _retrieve_graphs_accessor() -> GraphsResource:
+ """
+ Acquires the graphs accessor from the WriterAIManager singleton instance.
+
+ :returns: The graphs accessor instance.
+ :rtype: GraphsResource
+ """
+ return WriterAIManager.acquire_client().graphs
+
+ @property
+ def id(self) -> str:
+ return self._get_property('id')
+
+ @property
+ def created_at(self) -> datetime:
+ return self._get_property('created_at')
+
+ def _fetch_object_updates(self):
+ """
+ Fetches updates for the graph object if it is stale.
+ """
+ if self.id in Graph.stale_ids:
+ graphs = self._retrieve_graphs_accessor()
+ fresh_object = graphs.retrieve(self.id)
+ self._wrapped = fresh_object
+ Graph.stale_ids.remove(self.id)
+
+ @property
+ def name(self) -> str:
+ self._fetch_object_updates()
+ return self._wrapped.name
+
+ @property
+ def description(self) -> Optional[str]:
+ self._fetch_object_updates()
+ return self._wrapped.description
+
+ @property
+ def file_status(self):
+ self._fetch_object_updates()
+ return self._wrapped.file_status
+
+ def update(
+ self,
+ name: Optional[str] = None,
+ description: Optional[str] = None,
+ config: Optional[APIOptions] = None
+ ) -> GraphUpdateResponse:
+ """
+ Updates the graph with the given parameters.
+
+ :param name: The new name for the graph.
+ :type name: Optional[str]
+ :param description: The new description for the graph.
+ :type description: Optional[str]
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The response from the update operation.
+ :rtype: GraphUpdateResponse
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+
+ # We use the payload dictionary
+ # to distinguish between None-values
+ # and NotGiven values
+ payload = {}
+ if name:
+ payload["name"] = name
+ if description:
+ payload["description"] = description
+ graphs = self._retrieve_graphs_accessor()
+ response = graphs.update(self.id, **payload, **config)
+ Graph.stale_ids.add(self.id)
+ return response
+
+ def add_file(
+ self,
+ file_id_or_file: Union['File', str],
+ config: Optional[APIOptions] = None
+ ) -> 'File':
+ """
+ Adds a file to the graph.
+
+ :param file_id_or_file: The file object or file ID to add.
+ :type file_id_or_file: Union['File', str]
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The added file object.
+ :rtype: File
+ :raises ValueError: If the input is neither a File object nor a file ID string.
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ file_id = None
+ if isinstance(file_id_or_file, File):
+ file_id = file_id_or_file.id
+ elif isinstance(file_id_or_file, str):
+ file_id = file_id_or_file
+ else:
+ raise ValueError(
+ "'Graph.add_file' method accepts either 'File' object" +
+ f" or ID of file as string; got '{type(file_id_or_file)}'"
+ )
+ graphs = self._retrieve_graphs_accessor()
+ response = graphs.add_file_to_graph(
+ graph_id=self.id,
+ file_id=file_id,
+ **config
+ )
+ Graph.stale_ids.add(self.id)
+ return File(response)
+
+ def remove_file(
+ self,
+ file_id_or_file: Union['File', str],
+ config: Optional[APIOptions] = None
+ ) -> Optional[GraphRemoveFileFromGraphResponse]:
+ """
+ Removes a file from the graph.
+
+ :param file_id_or_file: The file object or file ID to remove.
+ :type file_id_or_file: Union['File', str]
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The response from the remove operation.
+ :rtype: Optional[GraphRemoveFileFromGraphResponse]
+ :raises ValueError: If the input is neither a File object nor a file ID string.
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ file_id = None
+ if isinstance(file_id_or_file, File):
+ file_id = file_id_or_file.id
+ elif isinstance(file_id_or_file, str):
+ file_id = file_id_or_file
+ else:
+ raise ValueError(
+ "'Graph.remove_file' method accepts either 'File' object" +
+ f" or ID of file as string; got '{type(file_id_or_file)}'"
+ )
+ graphs = self._retrieve_graphs_accessor()
+ response = graphs.remove_file_from_graph(
+ graph_id=self.id,
+ file_id=file_id
+ )
+ Graph.stale_ids.add(self.id)
+ return response
+
+
+def create_graph(
+ name: str,
+ description: Optional[str] = None,
+ config: Optional[APIOptions] = None
+ ) -> Graph:
+ """
+ Creates a new graph with the given parameters.
+
+ :param name: The name of the graph.
+ :type name: str
+ :param description: The description of the graph.
+ :type description: Optional[str]
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The created graph object.
+ :rtype: Graph
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ graphs = Graph._retrieve_graphs_accessor()
+ graph_object = graphs.create(name=name, description=description or NotGiven(), **config)
+ converted_object = cast(SDKGraph, graph_object)
+ graph = Graph(converted_object)
+ return graph
+
+
+def retrieve_graph(
+ graph_id: str,
+ config: Optional[APIOptions] = None
+ ) -> Graph:
+ """
+ Retrieves a graph by its ID.
+
+ :param graph_id: The ID of the graph to retrieve.
+ :type graph_id: str
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The retrieved graph object.
+ :rtype: Graph
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ graphs = Graph._retrieve_graphs_accessor()
+ graph_object = graphs.retrieve(graph_id, **config)
+ graph = Graph(graph_object)
+ return graph
+
+
+def list_graphs(config: Optional[APIListOptions] = None) -> List[Graph]:
+ """
+ Lists all graphs with the given configuration.
+
+ :param config: Additional configuration options.
+ :type config: Optional[APIListOptions]
+ :returns: A list of graph objects.
+ :rtype: List[Graph]
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ - `after` (Union[str, NotGiven]): Filter to retrieve items created after a specific cursor.
+ - `before` (Union[str, NotGiven]): Filter to retrieve items created before a specific cursor.
+ - `limit` (Union[int, NotGiven]): The number of items to retrieve.
+ - `order` (Union[Literal["asc", "desc"], NotGiven]): The order in which to retrieve items.
+ """
+ config = config or {}
+ graphs = Graph._retrieve_graphs_accessor()
+ sdk_graphs = graphs.list(**config)
+ return [Graph(sdk_graph) for sdk_graph in sdk_graphs]
+
+
+def delete_graph(graph_id_or_graph: Union[Graph, str]) -> GraphDeleteResponse:
+ """
+ Deletes a graph by its ID or object.
+
+ :param graph_id_or_graph: The graph object or graph ID to delete.
+ :type graph_id_or_graph: Union[Graph, str]
+ :returns: The response from the delete operation.
+ :rtype: GraphDeleteResponse
+ :raises ValueError: If the input is neither a Graph object nor a graph ID string.
+ """
+ graph_id = None
+ if isinstance(graph_id_or_graph, Graph):
+ graph_id = graph_id_or_graph.id
+ elif isinstance(graph_id_or_graph, str):
+ graph_id = graph_id_or_graph
+ else:
+ raise ValueError(
+ "'delete_graph' method accepts either 'Graph' object" +
+ f" or ID of graph as string; got '{type(graph_id_or_graph)}'"
+ )
+ graphs = Graph._retrieve_graphs_accessor()
+ return graphs.delete(graph_id)
+
+
+class File(SDKWrapper):
+ """
+ A wrapper class for SDK File objects, providing additional functionality.
+
+ Attributes:
+ _wrapped (writerai.types.File): The wrapped SDKFile object.
+ """
+ _wrapped: SDKFile
+
+ def __init__(self, file_object: SDKFile):
+ """
+ Initializes the File with the given SDKFile object.
+
+ :param file_object: The SDKFile object to wrap.
+ :type file_object: writerai.types.File
+ """
+ self._wrapped = file_object
+
+ @staticmethod
+ def _retrieve_files_accessor() -> FilesResource:
+ """
+ Acquires the files client from the WriterAIManager singleton instance.
+
+ :returns: The files client instance.
+ :rtype: FilesResource
+ """
+ return WriterAIManager.acquire_client().files
+
+ @property
+ def id(self) -> str:
+ return self._get_property('id')
+
+ @property
+ def created_at(self) -> datetime:
+ return self._get_property('created_at')
+
+ @property
+ def graph_ids(self) -> List[str]:
+ return self._get_property('graph_ids')
+
+ @property
+ def name(self) -> str:
+ return self._get_property('name')
+
+ def download(self) -> BinaryAPIResponse:
+ """
+ Downloads the file content.
+
+ :returns: The response containing the file content.
+ :rtype: BinaryAPIResponse
+ """
+ files = self._retrieve_files_accessor()
+ return files.download(self.id)
+
+
+def retrieve_file(file_id: str, config: Optional[APIOptions] = None) -> File:
+ """
+ Retrieves a file by its ID.
+
+ :param file_id: The ID of the file to retrieve.
+ :type file_id: str
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The retrieved file object.
+ :rtype: writerai.types.File
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ files = File._retrieve_files_accessor()
+ file_object = files.retrieve(file_id, **config)
+ file = File(file_object)
+ return file
+
+
+def list_files(config: Optional[APIListOptions] = None) -> List[File]:
+ """
+ Lists all files with the given configuration.
+
+ :param config: Additional configuration options.
+ :type config: Optional[APIListOptions]
+ :returns: A list of file objects.
+ :rtype: List[File]
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ - `after` (Union[str, NotGiven]): Filter to retrieve items created after a specific cursor.
+ - `before` (Union[str, NotGiven]): Filter to retrieve items created before a specific cursor.
+ - `limit` (Union[int, NotGiven]): The number of items to retrieve.
+ - `order` (Union[Literal["asc", "desc"], NotGiven]): The order in which to retrieve items.
+ """
+ config = config or {}
+ files = File._retrieve_files_accessor()
+ sdk_files = files.list(**config)
+ return [File(sdk_file) for sdk_file in sdk_files]
+
+
+def upload_file(
+ data: bytes,
+ type: str,
+ name: Optional[str] = None,
+ config: Optional[APIOptions] = None
+ ) -> File:
+ """
+ Uploads a new file with the given parameters.
+
+ :param data: The file content as bytes.
+ :type data: bytes
+ :param type: The MIME type of the file.
+ :type type: str
+ :param name: The name of the file.
+ :type name: Optional[str]
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The uploaded file object.
+ :rtype: writerai.types.File
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ files = File._retrieve_files_accessor()
+
+ file_name = name or f"WF-{type}-{uuid4()}"
+ content_disposition = f'attachment; filename="{file_name}"'
+
+ # Now calling the upload method with correct types.
+ sdk_file = files.upload(
+ content=data,
+ content_type=type,
+ content_disposition=content_disposition
+ )
+ return File(sdk_file)
+
+
+def delete_file(
+ file_id_or_file: Union['File', str],
+ config: Optional[APIOptions] = None
+ ) -> FileDeleteResponse:
+ """
+ Deletes a file by its ID or object.
+
+ :param file_id_or_file: The file object or file ID to delete.
+ :type file_id_or_file: Union['File', str]
+ :param config: Additional configuration options.
+ :type config: Optional[APIOptions]
+ :returns: The response from the delete operation.
+ :rtype: FileDeleteResponse
+ :raises ValueError: If the input is neither a File object nor a file ID string.
+
+ The `config` dictionary can include the following keys:
+ - `extra_headers` (Optional[Headers]): Additional headers for the request.
+ - `extra_query` (Optional[Query]): Additional query parameters for the request.
+ - `extra_body` (Optional[Body]): Additional body parameters for the request.
+ - `timeout` (Union[float, httpx.Timeout, None, NotGiven]): Timeout for the request.
+ """
+ config = config or {}
+ file_id = None
+ if isinstance(file_id_or_file, File):
+ file_id = file_id_or_file.id
+ elif isinstance(file_id_or_file, str):
+ file_id = file_id_or_file
+ else:
+ raise ValueError(
+ "'delete_file' method accepts either 'File' object" +
+ f" or ID of file as string; got '{type(file_id_or_file)}'"
+ )
+
+ files = File._retrieve_files_accessor()
+ return files.delete(file_id, **config)
+
+
class Conversation:
"""
Manages messages within a conversation flow with an AI system, including message validation,
@@ -307,8 +841,7 @@ def complete(self, config: Optional['ChatOptions'] = None) -> 'Conversation.Mess
:return: Generated message.
:raises RuntimeError: If response data was not properly formatted to retrieve model text.
"""
- if not config:
- config = {'max_tokens': 2048}
+ config = config or {'max_tokens': 2048}
client = WriterAIManager.acquire_client()
passed_messages: Iterable[WriterAIMessage] = [self._prepare_message(message) for message in self.messages]
@@ -343,8 +876,7 @@ def stream_complete(self, config: Optional['ChatOptions'] = None) -> Generator[d
:param config: Optional parameters to pass for processing.
:yields: Model response chunks as they arrive from the stream.
"""
- if not config:
- config = {'max_tokens': 2048}
+ config = config or {'max_tokens': 2048}
client = WriterAIManager.acquire_client()
passed_messages: Iterable[WriterAIMessage] = [self._prepare_message(message) for message in self.messages]
@@ -403,8 +935,7 @@ def complete(initial_text: str, config: Optional['CreateOptions'] = None) -> str
:return: The text of the first choice from the completion response.
:raises RuntimeError: If response data was not properly formatted to retrieve model text.
"""
- if not config:
- config = {}
+ config = config or {}
client = WriterAIManager.acquire_client()
request_model = config.get("model", None) or WriterAIManager.use_completion_model()
diff --git a/src/writer/core.py b/src/writer/core.py
index c72a755f7..8cb2cf442 100644
--- a/src/writer/core.py
+++ b/src/writer/core.py
@@ -1053,6 +1053,19 @@ def _transform_date_change(self, ev) -> str:
return payload
+ def _transform_time_change(self, ev) -> str:
+ payload = ev.payload
+
+ if not isinstance(payload, str):
+ raise ValueError("Time must be a string.")
+ try:
+ time.strptime(payload, '%H:%M')
+ except ValueError:
+ raise ValueError(
+ "Time must be in hh:mm format (in 24-hour format that includes leading zeros).")
+
+ return payload
+
def _transform_change_page_size(self, ev) -> Optional[int]:
try:
return int(ev.payload)
diff --git a/src/writer/deploy.py b/src/writer/deploy.py
index 1f746328c..d09bdf654 100644
--- a/src/writer/deploy.py
+++ b/src/writer/deploy.py
@@ -15,6 +15,7 @@
WRITER_DEPLOY_URL = os.getenv("WRITER_DEPLOY_URL", "https://api.writer.com/v1/deployment/apps")
def deploy(path, token, env):
+ check_app(token)
tar = pack_project(path)
upload_package(tar, token, env)
@@ -90,6 +91,27 @@ def match(file_path) -> bool: return False
return f
+
+def check_app(token):
+ url = get_app_url(token)
+ if url:
+ print("[WARNING] This token was already used to deploy a different app")
+ print(f"[WARNING] URL: {url}")
+ print("[WARNING] If looking to deploy to a different URL, use a different API key. ")
+ if input("[WARNING] Are you sure you want to overwrite? (y/N)").lower() != "y":
+ sys.exit(1)
+
+def get_app_url(token):
+ with requests.get(WRITER_DEPLOY_URL, params={"lineLimit": 1}, headers={"Authorization": f"Bearer {token}"}) as resp:
+ try:
+ resp.raise_for_status()
+ except Exception as e:
+ print(e)
+ print(resp.json())
+ return None
+ data = resp.json()
+ return data['status']['url']
+
def get_logs(token, params):
with requests.get(WRITER_DEPLOY_URL, params = params, headers={"Authorization": f"Bearer {token}"}) as resp:
try:
diff --git a/src/writer/serve.py b/src/writer/serve.py
index 312922ce5..f52611344 100644
--- a/src/writer/serve.py
+++ b/src/writer/serve.py
@@ -62,10 +62,25 @@ def get_asgi_app(
user_app_path: str,
serve_mode: ServeMode,
enable_remote_edit: bool = False,
- enable_server_setup: bool = False,
+ enable_server_setup: bool = True,
on_load: Optional[Callable] = None,
on_shutdown: Optional[Callable] = None,
) -> WriterFastAPI:
+ """
+ Builds an ASGI server that can be injected into another ASGI application
+ or an asgi server like uvicorn
+
+ >>> asgi_app = writer.serve.get_asgi_app("app1", "run")
+ >>> uvicorn.run(asgi_app, host="0.0.0.0", port=5328)
+
+ :param user_app_path: writer application path
+ :param serve_mode: server mode (run, edit)
+ :param enable_remote_edit: allow editing from the internet (by default, editing only works locally)
+ :param enable_server_setup: enables fastapi setup hook on startup, server_setup.py
+ :param on_load: callback called on loading
+ :param on_shutdown: callback called at shutdown
+ :return: ASGI Server
+ """
global app
if serve_mode not in ["run", "edit"]:
raise ValueError("""Invalid mode. Must be either "run" or "edit".""")
diff --git a/tests/backend/test_auth.py b/tests/backend/test_auth.py
index 6e7aa6f69..7236d0cff 100644
--- a/tests/backend/test_auth.py
+++ b/tests/backend/test_auth.py
@@ -12,7 +12,7 @@ def test_basicauth_authentication_module_should_ask_user_to_write_basic_auth(sel
This test verifies that a user has to authenticate when the basic auth module is active.
"""
- asgi_app: fastapi.FastAPI = writer.serve.get_asgi_app(test_basicauth_dir, "run", enable_server_setup=True)
+ asgi_app: fastapi.FastAPI = writer.serve.get_asgi_app(test_basicauth_dir, "run")
with fastapi.testclient.TestClient(asgi_app) as client:
res = client.get("/api/init")
assert res.status_code == 401
@@ -22,7 +22,16 @@ def test_basicauth_authentication_module_should_accept_user_using_authorization(
This test verifies that a user can use the application when providing basic auth credentials.
"""
- asgi_app: fastapi.FastAPI = writer.serve.get_asgi_app(test_basicauth_dir, "run", enable_server_setup=True)
+ asgi_app: fastapi.FastAPI = writer.serve.get_asgi_app(test_basicauth_dir, "run")
with fastapi.testclient.TestClient(asgi_app) as client:
res = client.get("/static/file.js", auth=("admin", "admin"))
assert res.status_code == 200
+
+ def test_basicauth_authentication_module_disabled_when_server_setup_hook_is_disabled(self):
+ """
+ This test verifies that a user bypass the authentication when server setup hook is disabled.
+ """
+ asgi_app: fastapi.FastAPI = writer.serve.get_asgi_app(test_basicauth_dir, "run", enable_server_setup=False)
+ with fastapi.testclient.TestClient(asgi_app) as client:
+ res = client.get("/api/init")
+ assert res.status_code == 405
diff --git a/tests/backend/test_core.py b/tests/backend/test_core.py
index 434f3bc6e..7122c96a3 100644
--- a/tests/backend/test_core.py
+++ b/tests/backend/test_core.py
@@ -595,6 +595,23 @@ def test_date_change(self) -> None:
self.ed.transform(ev_valid)
assert ev_valid.payload == "2019-11-23"
+ def test_time_change(self) -> None:
+ ev_invalid = WriterEvent(
+ type="wf-time-change",
+ instancePath=self.root_instance_path,
+ payload="virus"
+ )
+ with pytest.raises(RuntimeError):
+ self.ed.transform(ev_invalid)
+
+ ev_valid = WriterEvent(
+ type="wf-time-change",
+ instancePath=self.root_instance_path,
+ payload="23:59"
+ )
+ self.ed.transform(ev_valid)
+ assert ev_valid.payload == "23:59"
+
class TestFileWrapper():
diff --git a/tests/e2e/presets/state/main.py b/tests/e2e/presets/state/main.py
index 5ac7c9ac7..957d50042 100644
--- a/tests/e2e/presets/state/main.py
+++ b/tests/e2e/presets/state/main.py
@@ -1,6 +1,12 @@
import writer as wf
initial_state = wf.init_state({
+ "types": {
+ "none": None,
+ "string": "Hello, World!",
+ "integer": 42,
+ "float": 3.14,
+ },
"counter": 26,
"list": ["A", "B", "C"],
"dict": {"a": 1, "b": 2},
diff --git a/tests/e2e/tests/button.spec.ts b/tests/e2e/tests/button.spec.ts
index db0e06448..5adb10859 100644
--- a/tests/e2e/tests/button.spec.ts
+++ b/tests/e2e/tests/button.spec.ts
@@ -26,7 +26,7 @@ test.describe("button", () => {
.dragTo(page.locator(".CoreSection .ChildlessPlaceholder"));
await page.locator(COMPONENT_LOCATOR).click();
await page
- .locator('.BuilderFieldsText[data-key="text"] input')
+ .locator('.BuilderFieldsText[data-automation-key="text"] input')
.fill("Hello, World!");
await expect(page.locator(COMPONENT_LOCATOR)).toContainText(
"Hello, World!",
diff --git a/tests/e2e/tests/components.spec.ts b/tests/e2e/tests/components.spec.ts
index b0cbacae8..2ae9bae2b 100644
--- a/tests/e2e/tests/components.spec.ts
+++ b/tests/e2e/tests/components.spec.ts
@@ -26,6 +26,7 @@ const mapComponents = {
sidebar: {test: 'basic'},
fileinput: {locator: '.component.wf-type-fileinput label'},
dateinput: {locator: '.component.wf-type-dateinput label'},
+ timeinput: {locator: '.component.wf-type-timeinput label'},
sliderinput: {locator: '.component.wf-type-sliderinput label'},
numberinput: {locator: '.component.wf-type-numberinput label'},
textinput: {locator: '.component.wf-type-textinput label'},
diff --git a/tests/e2e/tests/image.spec.ts b/tests/e2e/tests/image.spec.ts
index dbb8aa1c4..71b255020 100644
--- a/tests/e2e/tests/image.spec.ts
+++ b/tests/e2e/tests/image.spec.ts
@@ -25,7 +25,7 @@ test.describe("image", () => {
.dragTo(page.locator(".CoreSection .ChildlessPlaceholder"));
await page.locator(COMPONENT_LOCATOR).click();
await page
- .locator('.BuilderFieldsText[data-key="caption"] input')
+ .locator('.BuilderFieldsText[data-automation-key="caption"] input')
.fill("Hello, World!");
await expect(page.locator(COMPONENT_LOCATOR)).toContainText(
"Hello, World!",
diff --git a/tests/e2e/tests/lowCode.spec.ts b/tests/e2e/tests/lowCode.spec.ts
index 64451d88b..fc644aa3c 100644
--- a/tests/e2e/tests/lowCode.spec.ts
+++ b/tests/e2e/tests/lowCode.spec.ts
@@ -79,8 +79,8 @@ with ui.find('results'):
await page.locator(`.results .wf-type-${type}.component`).click({force: true});
for (const [key, value] of Object.entries(props)) {
- await expect(page.locator(`.BuilderSettings div[data-key="${key}"] input, .BuilderSettings div[data-key="${key}"] textarea`)).toHaveCount(1);
- await expect(page.locator(`.BuilderSettings div[data-key="${key}"] input, .BuilderSettings div[data-key="${key}"] textarea`)).toHaveValue(value);
+ await expect(page.locator(`.BuilderSettings div[data-automation-key="${key}"] input, .BuilderSettings div[data-automation-key="${key}"] textarea`)).toHaveCount(1);
+ await expect(page.locator(`.BuilderSettings div[data-automation-key="${key}"] input, .BuilderSettings div[data-automation-key="${key}"] textarea`)).toHaveValue(value);
}
if (renderError) {
diff --git a/tests/e2e/tests/reuse.spec.ts b/tests/e2e/tests/reuse.spec.ts
index 7a32a84e0..361d2a6c8 100644
--- a/tests/e2e/tests/reuse.spec.ts
+++ b/tests/e2e/tests/reuse.spec.ts
@@ -6,7 +6,7 @@ test.describe("Reuse component", () => {
const fillSettingsField = async (page: Page, key: string, value: string) => {
await page
- .locator(`.BuilderFieldsText[data-key="${key}"] input, .BuilderFieldsText[data-key="${key}"] textarea`)
+ .locator(`.BuilderFieldsText[data-automation-key="${key}"] input, .BuilderFieldsText[data-automation-key="${key}"] textarea`)
.fill(value);
}
diff --git a/tests/e2e/tests/state.spec.ts b/tests/e2e/tests/state.spec.ts
index b00a2359a..cdedfa6f1 100644
--- a/tests/e2e/tests/state.spec.ts
+++ b/tests/e2e/tests/state.spec.ts
@@ -4,7 +4,7 @@ import { test, expect } from "@playwright/test";
const setTextField = async (page, text) => {
await page.locator('div.CoreText.component').click();
await page
- .locator('.BuilderFieldsText[data-key="text"] textarea')
+ .locator('.BuilderFieldsText[data-automation-key="text"] .templateInput')
.fill(text);
}
diff --git a/tests/e2e/tests/stateAutocompletion.spec.ts b/tests/e2e/tests/stateAutocompletion.spec.ts
new file mode 100644
index 000000000..8ab514c41
--- /dev/null
+++ b/tests/e2e/tests/stateAutocompletion.spec.ts
@@ -0,0 +1,144 @@
+
+import { test, expect } from "@playwright/test";
+
+const setTextField = async (page, text) => {
+ await page.locator('div.CoreText.component').click();
+ await page
+ .locator('.BuilderFieldsText[data-automation-key="text"] .templateInput')
+ .fill(text);
+}
+
+test.describe("state autocompletion", () => {
+ let url: string;
+ test.beforeAll(async ({request}) => {
+ const response = await request.post(`/preset/state`);
+ expect(response.ok()).toBeTruthy();
+ ({url} = await response.json());
+ });
+
+ test.afterAll(async ({request}) => {
+ await request.delete(url);
+ });
+
+ test.beforeEach(async ({ page }) => {
+ await page.goto(url);
+ });
+
+ test.describe("text", () => {
+ test("completion", async ({ page }) => {
+ await setTextField(page, "@{types.");
+ page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.prop:text-matches("string")').click();
+ await expect(page
+ .locator('.BuilderFieldsText[data-automation-key="text"] .templateInput'))
+ .toHaveValue("@{types.string");
+ });
+ test("counter", async ({ page }) => {
+ await setTextField(page, "@{counter");
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.prop')).toContainText(["counter"]);
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.type')).toContainText(["number"]);
+ });
+
+ test("types", async ({ page }) => {
+ await setTextField(page, "@{types.");
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.prop')).toHaveText(["none", "string", "integer", "float"]);
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.type')).toHaveText(["null", "string", "number", "number"]);
+ });
+
+ test("deeply nested", async ({ page }) => {
+ await setTextField(page, "@{nested.c.");
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.prop')).toContainText(["d", "e"]);
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="text"] .fieldStateAutocomplete span.type')).toContainText(["number", "number"]);
+ });
+ });
+
+ test.describe("text with dropdown", () => {
+ test("options should show on focus", async ({ page }) => {
+ await page.locator('div.CoreText.component').click();
+ await page
+ .locator('.BuilderFieldsText[data-automation-key="useMarkdown"] .templateInput')
+ .focus();
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="useMarkdown"] datalist option[value="yes"]')).toHaveCount(1);
+ await expect(page.locator('.BuilderFieldsText[data-automation-key="useMarkdown"] datalist option[value="no"]')).toHaveCount(1);
+ })
+ });
+
+ test.describe("Key-Value", () => {
+ test("Static List - completion", async ({ page }) => {
+ const FIELD = `.BuilderFieldsOptions[data-automation-key="options"]`;
+ await page
+ .locator(`div.component.button[data-component-type="radioinput"]`)
+ .dragTo(page.locator(".CorePage"));
+
+ await page.locator('div.CoreRadioInput.component > label').click();
+ await page
+ .locator(`${FIELD} button.chip:text-matches("Static List")`)
+ .click();
+ await page
+ .locator(`${FIELD} .inputKey .templateInput`)
+ .fill("@{types.");
+ await expect(page.locator(`${FIELD} .inputKey .fieldStateAutocomplete span.prop`)).toHaveText(["none", "string", "integer", "float"]);
+ await expect(page.locator(`${FIELD} .inputKey .fieldStateAutocomplete span.type`)).toHaveText(["null", "string", "number", "number"]);
+ page.locator(`${FIELD} .inputKey .fieldStateAutocomplete span.prop:text-matches("string")`).click();
+ await expect(page
+ .locator(`${FIELD} .inputKey .templateInput`))
+ .toHaveValue("@{types.string");
+ await page
+ .locator(`${FIELD} .inputValue .templateInput`)
+ .fill("@{types.");
+ await expect(page.locator(`${FIELD} .inputValue .fieldStateAutocomplete span.prop`)).toHaveText(["none", "string", "integer", "float"]);
+ await expect(page.locator(`${FIELD} .inputValue .fieldStateAutocomplete span.type`)).toHaveText(["null", "string", "number", "number"]);
+ page.locator(`${FIELD} .inputValue .fieldStateAutocomplete span.prop:text-matches("string")`).click();
+ await expect(page
+ .locator(`${FIELD} .inputValue .templateInput`))
+ .toHaveValue("@{types.string");
+ await page.locator('[data-automation-action="delete"]').click();
+ });
+
+ test("JSON - completion", async ({ page }) => {
+ const FIELD = `.BuilderFieldsOptions[data-automation-key="options"]`;
+ await page
+ .locator(`div.component.button[data-component-type="radioinput"]`)
+ .dragTo(page.locator(".CorePage"));
+
+ await page.locator('div.CoreRadioInput.component > label').click();
+ await page
+ .locator(`${FIELD} button.chip:text-matches("JSON")`)
+ .click();
+ await page
+ .locator(`${FIELD} .templateInput`)
+ .fill("@{types.");
+ await expect(page.locator(`${FIELD} .fieldStateAutocomplete span.prop`)).toHaveText(["none", "string", "integer", "float"]);
+ await expect(page.locator(`${FIELD} .fieldStateAutocomplete span.type`)).toHaveText(["null", "string", "number", "number"]);
+ page.locator(`${FIELD} .fieldStateAutocomplete span.prop:text-matches("string")`).click();
+ await expect(page
+ .locator(`${FIELD} .templateInput`))
+ .toHaveValue("@{types.string");
+ await page.locator('[data-automation-action="delete"]').click();
+ });
+ });
+
+ function testFieldType(type, key, componentSelector) {
+ test(`${type} field - state completion`, async ({ page }) => {
+ const FIELD = `.${type}[data-automation-key="${key}"]`;
+ await page.locator(componentSelector).click();
+ await page
+ .locator(`${FIELD} button.chip:text-matches("CSS")`)
+ .click();
+ await page
+ .locator(`${FIELD} .templateInput`)
+ .fill("@{types.");
+ await expect(page.locator(`${FIELD} .fieldStateAutocomplete span.prop`)).toHaveText(["none", "string", "integer", "float"]);
+ await expect(page.locator(`${FIELD} .fieldStateAutocomplete span.type`)).toHaveText(["null", "string", "number", "number"]);
+ page.locator(`${FIELD} .fieldStateAutocomplete span.prop:text-matches("string")`).click();
+ await expect(page
+ .locator(`${FIELD} .templateInput`))
+ .toHaveValue("@{types.string");
+ });
+ }
+
+ testFieldType("BuilderFieldsColor", "primaryTextColor", 'div.CoreText.component');
+ testFieldType("BuilderFieldsShadow", "buttonShadow", '.BuilderTreeBranch [data-branch-component-type="root"]');
+ testFieldType("BuilderFieldsAlign", "contentHAlign", '.BuilderTreeBranch [data-branch-component-type="root"]');
+ testFieldType("BuilderFieldsPadding", "contentPadding", '.BuilderTreeBranch [data-branch-component-type="root"]');
+ testFieldType("BuilderFieldsWidth", "contentWidth", '.BuilderTreeBranch [data-branch-component-type="root"]');
+});
diff --git a/tests/e2e/tests/undoRedo.spec.ts b/tests/e2e/tests/undoRedo.spec.ts
index 4ef88e6c4..072604344 100644
--- a/tests/e2e/tests/undoRedo.spec.ts
+++ b/tests/e2e/tests/undoRedo.spec.ts
@@ -48,7 +48,7 @@ test.describe('undo and redo', () => {
await page.locator(COMPONENT_LOCATOR).click();
await page
- .locator('.BuilderFieldsText[data-key="text"] input')
+ .locator('.BuilderFieldsText[data-automation-key="text"] input')
.fill('cool text');
await page.locator("button.undo").click();
await expect(page.locator(COMPONENT_LOCATOR)).toHaveText('Button Text')