AL: more import fixes

.version

@@ -1 +1 @@
-0.1.3
+0.1.4

hyperscale/core/engines/__init__.py

@@ -1 +0,0 @@
-from .types.registry import registered_engines

hyperscale/core/engines/client/client.py

@@ -2,7 +2,7 @@
 import threading
 import uuid
 from asyncio import Future
-from typing import Dict, Generic, Iterable, Optional, Union
+from typing import (Dict, Generic, Iterable, Optional, Union, Unpack,)
 
 from typing_extensions import TypeVarTuple, Unpack
 
@@ -96,7 +96,7 @@ def metadata_string(self):
         return f'Graph - {self.graph_name}:{self.graph_id} - thread:{self.thread_id} - process:{self.process_id} - Stage: {self.stage_name}:{self.stage_id} - '
 
     @property
-    def plugin(self) -> Dict[str, Union[Unpack[T]]]:
+    def plugin(self) -> Dict[str, Union[tuple[*T]]]:
         self._plugin._config = self._config
         self._plugin.actions = self.actions
         self._plugin.metadata_string = self.metadata_string

hyperscale/core/engines/client/client_types/base_client.py

@@ -10,7 +10,6 @@
     MercuryHTTP2Client,
     MercuryHTTPClient,
     MercuryPlaywrightClient,
-    MercuryTaskRunner,
     MercuryUDPClient,
     MercuryWebsocketClient,
 )
@@ -24,7 +23,6 @@
 from hyperscale.core.engines.types.http import HTTPAction, HTTPResult
 from hyperscale.core.engines.types.http2 import HTTP2Action, HTTP2Result
 from hyperscale.core.engines.types.playwright import PlaywrightCommand, PlaywrightResult
-from hyperscale.core.engines.types.task import Task, TaskResult
 from hyperscale.core.engines.types.udp import UDPAction, UDPResult
 from hyperscale.core.engines.types.websocket import WebsocketAction, WebsocketResult
 from hyperscale.core.experiments.mutations.types.base.mutation import Mutation
@@ -40,7 +38,6 @@
     MercuryHTTPClient,
     MercuryHTTP2Client,
     MercuryPlaywrightClient,
-    MercuryTaskRunner,
     MercuryUDPClient,
     MercuryWebsocketClient
 )
@@ -52,7 +49,6 @@
     HTTPAction,
     HTTP2Action,
     PlaywrightCommand,
-    Task,
     UDPAction,
     WebsocketAction
 )
@@ -64,7 +60,6 @@
     HTTPResult,
     HTTP2Result,
     PlaywrightResult,
-    TaskResult,
     UDPResult,
     WebsocketResult
 )

hyperscale/core/engines/client/config.py

@@ -1,9 +1,7 @@
-from typing import Dict, List, Union
+from typing import Dict, List, Union, Any
 
 import psutil
 
-from hyperscale.core.experiments.mutations.types.base.mutation import Mutation
-
 from .time_parser import TimeParser
 from .tracing_config import TracingConfig
 
@@ -49,7 +47,7 @@ def __init__(self, **kwargs) -> None:
         self.playwright_options = kwargs.get('playwright_options', {})
         self.experiment: Dict[str, Union[str, int, List[float]]] = kwargs.get('experiment', {})
         self.tracing: Union[TracingConfig, None] = kwargs.get('tracing')
-        self.mutations: Union[List[Mutation], None] = kwargs.get('mutations', [])
+        self.mutations: Union[List[Any], None] = kwargs.get('mutations', [])
         self.actions_filepaths: Union[Dict[str, str], None] = kwargs.get('actions_filepaths')
 
     def copy(self):

hyperscale/core/engines/types/__init__.py

@@ -6,5 +6,4 @@
 from .http3 import MercuryHTTP3Client
 from .playwright import MercuryPlaywrightClient
 from .websocket import MercuryWebsocketClient
-from .udp import MercuryUDPClient
-from .task import MercuryTaskRunner
+from .udp import MercuryUDPClient

hyperscale/core/engines/types/common/results_set.py

@@ -11,11 +11,11 @@
 from hyperscale.core.engines.types.http import HTTPResult
 from hyperscale.core.engines.types.http2 import HTTP2Result
 from hyperscale.core.engines.types.playwright import PlaywrightResult
-from hyperscale.core.engines.types.task import TaskResult
 from hyperscale.core.engines.types.udp import UDPResult
 from hyperscale.core.engines.types.websocket import WebsocketResult
 from hyperscale.core.personas.streaming.stream_analytics import StreamAnalytics
-from hyperscale.data.serializers import Serializer
+from hyperscale.data.serializers.serializer import Serializer
+from hyperscale.core.engines.types.task.result import TaskResult
 from hyperscale.monitoring import CPUMonitor, MemoryMonitor
 
 ResultsBatch = Dict[str, Union[List[BaseResult], float]]

hyperscale/core/engines/types/registry.py

@@ -5,7 +5,7 @@
 from .http2 import MercuryHTTP2Client
 from .http3 import MercuryHTTP3Client
 from .playwright import MercuryPlaywrightClient
-from .task import MercuryTaskRunner
+from .task.runner import MercuryTaskRunner
 from .udp import MercuryUDPClient
 from .websocket import MercuryWebsocketClient
 from .common.types import RequestTypes

hyperscale/core/engines/types/task/__init__.py

@@ -1,3 +0,0 @@
-from .runner import MercuryTaskRunner
-from .task import Task
-from .result import TaskResult

hyperscale/core/graphs/stages/execute/execute.py

@@ -33,7 +33,7 @@
     registered_personas,
 )
 from hyperscale.core.personas.streaming.stream_analytics import StreamAnalytics
-from hyperscale.data.serializers import Serializer
+from hyperscale.data.serializers.serializer import Serializer
 from hyperscale.logging import logging_manager
 from hyperscale.monitoring import CPUMonitor, MemoryMonitor
 from hyperscale.plugins.types.extension.extension_plugin import ExtensionPlugin

hyperscale/core/graphs/stages/execute/parallel/execute_actions.py

@@ -38,7 +38,7 @@
 from hyperscale.core.hooks.types.task.hook import TaskHook
 from hyperscale.core.personas import get_persona
 from hyperscale.core.personas.persona_registry import registered_personas
-from hyperscale.data.serializers import Serializer
+from hyperscale.data.serializers.serializer import Serializer
 from hyperscale.logging.hyperscale_logger import HyperscaleLogger, LoggerTypes, logging_manager
 from hyperscale.plugins.types.engine.engine_plugin import EnginePlugin
 from hyperscale.plugins.types.extension.extension_plugin import ExtensionPlugin

hyperscale/core/graphs/stages/optimize/optimize.py

@@ -34,7 +34,7 @@
 from hyperscale.core.hooks.types.internal.decorator import Internal
 from hyperscale.core.hooks.types.task.hook import TaskHook
 from hyperscale.core.personas.streaming.stream_analytics import StreamAnalytics
-from hyperscale.data.serializers import Serializer
+from hyperscale.data.serializers.serializer import Serializer
 from hyperscale.logging import logging_manager
 from hyperscale.monitoring import CPUMonitor, MemoryMonitor
 from hyperscale.monitoring.base.exceptions import MonitorKilledError

hyperscale/core/graphs/stages/optimize/parallel/optimize_stage.py

@@ -40,7 +40,7 @@
 from hyperscale.core.hooks.types.task.hook import TaskHook
 from hyperscale.core.personas.persona_registry import registered_personas
 from hyperscale.core.personas.streaming.stream_analytics import StreamAnalytics
-from hyperscale.data.serializers import Serializer
+from hyperscale.data.serializers.serializer import Serializer
 from hyperscale.logging.hyperscale_logger import HyperscaleLogger, LoggerTypes
 from hyperscale.monitoring import CPUMonitor, MemoryMonitor
 from hyperscale.plugins.types.engine.engine_plugin import EnginePlugin

hyperscale/data/serializers/__init__.py

@@ -1 +0,0 @@
-from .serializer import Serializer

hyperscale/data/serializers/serializer.py

@@ -25,6 +25,7 @@
 from hyperscale.core.engines.types.websocket.result import WebsocketResult
 from hyperscale.core.hooks.types.action.hook import ActionHook
 from hyperscale.core.hooks.types.task.hook import TaskHook
+from .serializer_types.task.task_serializer import TaskSerializer
 
 from .serializer_types import (
     GraphQLHTTP2Serializer,
@@ -34,7 +35,6 @@
     HTTP3Serializer,
     HTTPSerializer,
     PlaywrightSerializer,
-    TaskSerializer,
     UDPSerializer,
     WebsocketSerializer,
 )
@@ -67,6 +67,7 @@
 ]
 
 
+
 class Serializer:
 
     def __init__(self) -> None:

hyperscale/data/serializers/serializer_types/__init__.py

@@ -5,6 +5,5 @@
 from .http2.http2_serializer import HTTP2Serializer
 from .http3.http3_serializer import HTTP3Serializer
 from .playwright.playwright_serializer import PlaywrightSerializer
-from .task.task_serializer import TaskSerializer
 from .udp.udp_serializer import UDPSerializer
 from .websocket.websocket_serializer import WebsocketSerializer

hyperscale/data/serializers/serializer_types/task/task_serializer.py

@@ -2,9 +2,11 @@
 
 from hyperscale.core.engines.types.common.timeouts import Timeouts
 from hyperscale.core.engines.types.common.types import RequestTypes
-from hyperscale.core.engines.types.task.result import TaskResult
-from hyperscale.core.engines.types.task.runner import MercuryTaskRunner
-from hyperscale.core.engines.types.task.task import Task
+from hyperscale.core.engines.types.task.runner import (
+    MercuryTaskRunner,
+    TaskResult,
+    Task
+)
 from hyperscale.data.serializers.serializer_types.common.base_serializer import (
     BaseSerializer,
 )