vortexpy 6.2.4__tar.gz → 6.3.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- vortexpy-6.3.0/LICENSE +22 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/PKG-INFO +1 -1
- {vortexpy-6.2.4 → vortexpy-6.3.0}/pyproject.toml +1 -1
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/Jsonable.py +58 -15
- vortexpy-6.3.0/vortex/Jsonable_tuple_dict_coercion_test.py +144 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/SerialiseUtil.py +29 -8
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleBson_test.py +23 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleDocumentConverter.py +13 -6
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/__init__.py +1 -1
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataOfflineObserverService.py +21 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataOfflineObserverService_test.py +49 -2
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_test_fixtures.py +6 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortexpy.egg-info/PKG-INFO +1 -1
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortexpy.egg-info/SOURCES.txt +2 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/README.md +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/TwistedDeferredTimeout.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/run_http_upgraded_websocket_ping_client.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/run_http_upgraded_websocket_ping_server.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/run_http_upgraded_websocket_rpc_test_client.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/run_http_upgraded_websocket_rpc_test_server.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/run_websocket_rpc_test_client.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/run_websocket_rpc_test_server.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/setup_example_logging.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/example/store_and_load_json.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/setup.cfg +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/DataWrapTuple.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/DeferUtil.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/DeferUtil_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/MtlsAuthorizedClientRegistry.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/MtlsAuthorizedClientRegistry_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/MtlsServerSslOptions.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/Payload.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadEndpoint.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadEndpointTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadEnvelope.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadFilterKeys.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadIO.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadPriority.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadResponse.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadResponseTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadResponse_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PayloadTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/PerformTestActionTuple.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/SerialiseUtil_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TestTuple.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/Tuple.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleAction.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleBson.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleDataForTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TuplePerfTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TuplePolymorphicTupleTypeFieldArgTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleRestful.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleRestful_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleSelector.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/TupleTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexAccessControlContextABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexAuthenticatorABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexClientHttp.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexClientHttpTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexClientTcp.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexClientWebsocketFactory.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexConnectionABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexEndpointPermission.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexFactory.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexFactory_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexPayloadProtocol.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexPermission.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexPermissionError.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServer.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerConnection.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerConnection_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerHttpResource.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerTcp.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerTcp_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerWebsocket.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServerWebsocket_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexServer_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexSession.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexSession_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexTcpMemoryLeakPayloadTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexTcpMemoryLeakRawTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexUserDetailsABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexUtil.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexWritePushProducer.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/VortexWritePushProducer_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/TupleDataLiveLockManager.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/TupleDataLiveLockManager_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/TupleDataLoader.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/TupleDataLoaderDelegate.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/TupleDataLoaderTupleABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/TupleDataLoaderTuples.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/data_loader/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/event_bus/TupleChangeEventABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/event_bus/TupleChangeEventBus.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/event_bus/TupleChangeEventBusObserverABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/event_bus/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionProcessor.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionProcessorProxy.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionProcessorTestHandler.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionProcessor_shutdown_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionProcessor_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionPushOffline.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleActionPushOffline_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataAccessGranterABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataActionClient.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataActionClient_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableCache.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableCache_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableHandler.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableHandler_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableProxyHandler.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableProxyHandler_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObservableTestHandler.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataObserverClient.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/TupleDataProviderABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/VortexJSTupleLoaderTestHandler.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/handler/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/mypy_plugin.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/payload_many_tuples_benchmark_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/py.typed +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/GzippedDataHttpClient.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/GzippedDataHttpClientTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/GzippedPayloadHttpClient.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/RestfulHttpClient.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/RestfulResource.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/restful_http_client_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/restful/restful_resource_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/rpc/RPC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/rpc/RPCTest.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/rpc/RPC_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/rpc/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/sqla_orm/OrmCrudHandler.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/sqla_orm/TupleProviderForDb.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/sqla_orm/VortexTupleJson.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/sqla_orm/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleActionStorageSqlite.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleOfflineStorageNameService.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleOfflineStorageSecureService.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleOfflineStorageSecureService_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleOfflineStorageService.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleStorageServiceABC.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleStorageSqlite.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleStorageSqliteService.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/TupleStorageSqliteService_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/storage/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_json_schema/__init__.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_json_schema/constants.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_json_schema/json_schema_node_tuple.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_json_schema/tuple_json_schema_builder.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_json_schema/tuple_json_schema_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/tuple_json_schema/tuple_json_schema_test_tuples.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/twisted_runtime_metrics.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortex/twisted_runtime_metrics_test.py +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortexpy.egg-info/dependency_links.txt +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortexpy.egg-info/entry_points.txt +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortexpy.egg-info/requires.txt +0 -0
- {vortexpy-6.2.4 → vortexpy-6.3.0}/vortexpy.egg-info/top_level.txt +0 -0
vortexpy-6.3.0/LICENSE
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2016-2026 Flying Ion Pty Ltd
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
|
22
|
+
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "vortexpy"
|
|
7
|
-
version = "6.
|
|
7
|
+
version = "6.3.0"
|
|
8
8
|
license = {text = "MIT"}
|
|
9
9
|
authors = [{name = "Flying Ion Pty Ltd", email = "contact@flyingion.com"}]
|
|
10
10
|
description = "Flying Ion's observable, routable, data serialisation and transport code."
|
|
@@ -9,10 +9,9 @@
|
|
|
9
9
|
import logging
|
|
10
10
|
import traceback
|
|
11
11
|
import typing
|
|
12
|
+
from _collections import defaultdict
|
|
12
13
|
from copy import copy, deepcopy
|
|
13
14
|
from json import JSONEncoder
|
|
14
|
-
from typing import List
|
|
15
|
-
from _collections import defaultdict
|
|
16
15
|
|
|
17
16
|
logger = logging.getLogger(__name__)
|
|
18
17
|
|
|
@@ -27,15 +26,15 @@ JSONEncoder.item_separator = ","
|
|
|
27
26
|
JSONEncoder.key_separator = ":"
|
|
28
27
|
|
|
29
28
|
|
|
30
|
-
class Jsonable
|
|
29
|
+
class Jsonable:
|
|
31
30
|
"""Xmlable
|
|
32
31
|
Inherit from this class if you want to serialise to XML.
|
|
33
32
|
"""
|
|
34
33
|
|
|
35
|
-
__fieldNames__:
|
|
34
|
+
__fieldNames__: list[str] = None
|
|
36
35
|
__rapuiSerialiseType__ = T_GENERIC_CLASS
|
|
37
36
|
|
|
38
|
-
__rawJonableFields__:
|
|
37
|
+
__rawJonableFields__: list[str] = None
|
|
39
38
|
|
|
40
39
|
JSON_CLASS_TYPE = "_ct"
|
|
41
40
|
JSON_CLASS = "_c"
|
|
@@ -52,9 +51,7 @@ class Jsonable(object):
|
|
|
52
51
|
cls.__memoryLoggingEnabled = True
|
|
53
52
|
|
|
54
53
|
@classmethod
|
|
55
|
-
def memoryLoggingDump(
|
|
56
|
-
cls, top=10, over=100
|
|
57
|
-
) -> List[typing.Tuple[str, int]]:
|
|
54
|
+
def memoryLoggingDump(cls, top=10, over=100) -> list[tuple[str, int]]:
|
|
58
55
|
if not Jsonable.__memoryLoggingRefs:
|
|
59
56
|
return []
|
|
60
57
|
|
|
@@ -67,10 +64,10 @@ class Jsonable(object):
|
|
|
67
64
|
return list(filter(lambda x: x[1] >= over, data))[:top]
|
|
68
65
|
|
|
69
66
|
def __memLoggingKey(self):
|
|
70
|
-
if
|
|
71
|
-
key = "Tuple: " +
|
|
67
|
+
if self.__rapuiSerialiseType__ == T_RAPUI_TUPLE:
|
|
68
|
+
key = "Tuple: " + self.__tupleType__
|
|
72
69
|
|
|
73
|
-
elif
|
|
70
|
+
elif self.__rapuiSerialiseType__ == T_RAPUI_PAYLOAD:
|
|
74
71
|
assert hasattr(self, "filt"), "Payload is missing filt"
|
|
75
72
|
if "key" in self.filt:
|
|
76
73
|
key = "Payload: key=" + self.filt["key"]
|
|
@@ -78,7 +75,7 @@ class Jsonable(object):
|
|
|
78
75
|
key = "Payload: " + str(self.filt)
|
|
79
76
|
|
|
80
77
|
else:
|
|
81
|
-
key = "Jsonable: " +
|
|
78
|
+
key = "Jsonable: " + self.__rapuiSerialiseType__
|
|
82
79
|
|
|
83
80
|
return key
|
|
84
81
|
|
|
@@ -100,9 +97,7 @@ class Jsonable(object):
|
|
|
100
97
|
from .Tuple import TupleField
|
|
101
98
|
|
|
102
99
|
if isinstance(value, TupleField):
|
|
103
|
-
value = (
|
|
104
|
-
None if value.defaultValue == None else copy(value.defaultValue)
|
|
105
|
-
)
|
|
100
|
+
value = None if value.defaultValue == None else copy(value.defaultValue)
|
|
106
101
|
|
|
107
102
|
try:
|
|
108
103
|
valueType = V_NULL if value is None else toRapuiType(value)
|
|
@@ -316,6 +311,54 @@ class Jsonable(object):
|
|
|
316
311
|
):
|
|
317
312
|
value = enumClass(value)
|
|
318
313
|
|
|
314
|
+
# Reconstruct Tuple subclasses for fields annotated with a Tuple
|
|
315
|
+
# type. Serialised tuples may arrive as plain dicts (no _ct/_c
|
|
316
|
+
# markers) when the sender has no Tuple class for the value; the
|
|
317
|
+
# receiving class's annotation drives the coercion.
|
|
318
|
+
value = self._coerceValueToTypeHint(value, hints.get(name))
|
|
319
|
+
|
|
319
320
|
setattr(self, name, value)
|
|
320
321
|
|
|
321
322
|
return self
|
|
323
|
+
|
|
324
|
+
def _coerceValueToTypeHint(
|
|
325
|
+
self, value: typing.Any, typeHint: typing.Any
|
|
326
|
+
) -> typing.Any:
|
|
327
|
+
"""Coerce a plain JSON value into the type declared by *typeHint*.
|
|
328
|
+
|
|
329
|
+
Currently handles ``vortex.Tuple`` subclasses (and lists of them);
|
|
330
|
+
other hints pass through unchanged. Plain dicts are validated:
|
|
331
|
+
unknown keys raise ``KeyError``. Values that are neither a dict nor
|
|
332
|
+
``None`` for a Tuple-typed field raise ``ValueError``.
|
|
333
|
+
"""
|
|
334
|
+
from .Tuple import Tuple
|
|
335
|
+
|
|
336
|
+
tupleClass = utilTupleClassFromTypeHint(typeHint)
|
|
337
|
+
if tupleClass is not None:
|
|
338
|
+
if isinstance(value, tupleClass):
|
|
339
|
+
return value
|
|
340
|
+
if isinstance(value, dict):
|
|
341
|
+
extraKeys = set(value) - set(tupleClass.__fieldNames__)
|
|
342
|
+
if extraKeys:
|
|
343
|
+
raise KeyError(
|
|
344
|
+
f"Unexpected keys for {tupleClass.__name__}:"
|
|
345
|
+
f" {sorted(extraKeys)}"
|
|
346
|
+
)
|
|
347
|
+
return Tuple.restfulJsonDictToTupleWithValidation(value, tupleClass)
|
|
348
|
+
if value is None:
|
|
349
|
+
return None
|
|
350
|
+
raise ValueError(
|
|
351
|
+
f"Expected dict for {tupleClass.__name__}, got {type(value).__name__}"
|
|
352
|
+
)
|
|
353
|
+
|
|
354
|
+
origin = typing.get_origin(typeHint)
|
|
355
|
+
if origin is list and isinstance(value, list):
|
|
356
|
+
args = typing.get_args(typeHint)
|
|
357
|
+
if args:
|
|
358
|
+
elementClass = utilTupleClassFromTypeHint(args[0])
|
|
359
|
+
if elementClass is not None:
|
|
360
|
+
return [
|
|
361
|
+
self._coerceValueToTypeHint(item, args[0]) for item in value
|
|
362
|
+
]
|
|
363
|
+
|
|
364
|
+
return value
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
# ruff: noqa: C408, N999
|
|
2
|
+
# Copyright (c) 2016-2026 Flying Ion Pty Ltd
|
|
3
|
+
#
|
|
4
|
+
# This software is open source; the MIT license applies.
|
|
5
|
+
# See LICENSE for the full license text.
|
|
6
|
+
|
|
7
|
+
"""Tests for Jsonable.fromJsonDict coercion of plain dicts into Tuple fields."""
|
|
8
|
+
|
|
9
|
+
from __future__ import annotations
|
|
10
|
+
|
|
11
|
+
from datetime import UTC, datetime
|
|
12
|
+
from enum import StrEnum
|
|
13
|
+
|
|
14
|
+
import pytest
|
|
15
|
+
|
|
16
|
+
from vortex.SerialiseUtil import ISO8601
|
|
17
|
+
from vortex.Tuple import Tuple, TupleField, addTupleType
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
class _ColorE(StrEnum):
|
|
21
|
+
RED = "red"
|
|
22
|
+
BLUE = "blue"
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
@addTupleType
|
|
26
|
+
class _InnerTuple(Tuple):
|
|
27
|
+
__tupleType__ = "flyingion.vortex.JsonableCoercionInnerTuple"
|
|
28
|
+
fieldMap: dict[str, str] = TupleField()
|
|
29
|
+
color: _ColorE = TupleField()
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
@addTupleType
|
|
33
|
+
class _OuterTuple(Tuple):
|
|
34
|
+
__tupleType__ = "flyingion.vortex.JsonableCoercionOuterTuple"
|
|
35
|
+
inner: _InnerTuple = TupleField()
|
|
36
|
+
inners: list[_InnerTuple] = TupleField()
|
|
37
|
+
optInner: _InnerTuple | None = TupleField()
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
@addTupleType
|
|
41
|
+
class _DatetimeInnerTuple(Tuple):
|
|
42
|
+
__tupleType__ = "flyingion.vortex.JsonableCoercionDatetimeInnerTuple"
|
|
43
|
+
when: datetime = TupleField()
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
@addTupleType
|
|
47
|
+
class _DatetimeOuterTuple(Tuple):
|
|
48
|
+
__tupleType__ = "flyingion.vortex.JsonableCoercionDatetimeOuterTuple"
|
|
49
|
+
inner: _DatetimeInnerTuple = TupleField()
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def test_from_json_dict_coerces_nested_tuple_field() -> None:
|
|
53
|
+
data = dict(
|
|
54
|
+
inner=dict(fieldMap=dict(payload="body"), color="blue"),
|
|
55
|
+
inners=[dict(fieldMap=dict(x="y"), color="red")],
|
|
56
|
+
optInner=None,
|
|
57
|
+
)
|
|
58
|
+
result = _OuterTuple().fromJsonDict(data)
|
|
59
|
+
|
|
60
|
+
assert isinstance(result.inner, _InnerTuple), (
|
|
61
|
+
"plain dict inner must coerce to declared Tuple type"
|
|
62
|
+
)
|
|
63
|
+
assert result.inner.fieldMap == dict(payload="body"), (
|
|
64
|
+
"fieldMap must coerce nested dict values"
|
|
65
|
+
)
|
|
66
|
+
assert result.inner.color == _ColorE.BLUE, (
|
|
67
|
+
"enum field must coerce from string value"
|
|
68
|
+
)
|
|
69
|
+
assert isinstance(result.inners, list), "inners must be a list"
|
|
70
|
+
assert len(result.inners) == 1, "inners must contain one item"
|
|
71
|
+
assert isinstance(result.inners[0], _InnerTuple), (
|
|
72
|
+
"list item must coerce to declared Tuple type"
|
|
73
|
+
)
|
|
74
|
+
assert result.inners[0].color == _ColorE.RED, (
|
|
75
|
+
"list item enum must coerce from string value"
|
|
76
|
+
)
|
|
77
|
+
assert result.optInner is None, "optInner None must be preserved"
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
def test_from_json_dict_coerces_optional_nested_tuple_field() -> None:
|
|
81
|
+
data = dict(
|
|
82
|
+
inner=dict(fieldMap=dict(), color="red"),
|
|
83
|
+
inners=[],
|
|
84
|
+
optInner=dict(fieldMap=dict(k="v"), color="blue"),
|
|
85
|
+
)
|
|
86
|
+
result = _OuterTuple().fromJsonDict(data)
|
|
87
|
+
|
|
88
|
+
assert isinstance(result.optInner, _InnerTuple), (
|
|
89
|
+
"optional inner dict must coerce to declared Tuple type"
|
|
90
|
+
)
|
|
91
|
+
assert result.optInner.color == _ColorE.BLUE, (
|
|
92
|
+
"optional inner enum must coerce from string value"
|
|
93
|
+
)
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
def test_from_json_dict_coerces_nested_tuple_with_iso_datetime() -> None:
|
|
97
|
+
when = datetime(2024, 6, 15, 10, 30, 45, 123456, tzinfo=UTC)
|
|
98
|
+
data = dict(
|
|
99
|
+
inner=dict(when=when.strftime(ISO8601)),
|
|
100
|
+
)
|
|
101
|
+
result = _DatetimeOuterTuple().fromJsonDict(data)
|
|
102
|
+
|
|
103
|
+
assert isinstance(result.inner.when, datetime), (
|
|
104
|
+
"nested tuple datetime field must decode to datetime"
|
|
105
|
+
)
|
|
106
|
+
assert result.inner.when == when, "nested tuple datetime field must preserve value"
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
def test_from_json_dict_enum_inside_nested_tuple_reconstructs() -> None:
|
|
110
|
+
data = dict(inner=dict(fieldMap=dict(), color="blue"), inners=[], optInner=None)
|
|
111
|
+
result = _OuterTuple().fromJsonDict(data)
|
|
112
|
+
|
|
113
|
+
assert result.inner.color == _ColorE.BLUE, (
|
|
114
|
+
"nested enum field must reconstruct from string"
|
|
115
|
+
)
|
|
116
|
+
assert isinstance(result.inner.color, _ColorE), (
|
|
117
|
+
"nested enum field must be the enum type"
|
|
118
|
+
)
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
def test_from_json_dict_missing_required_key_raises_validation_error() -> None:
|
|
122
|
+
data = dict(
|
|
123
|
+
inner=dict(fieldMap=dict(payload="body")), # missing color
|
|
124
|
+
inners=[],
|
|
125
|
+
optInner=None,
|
|
126
|
+
)
|
|
127
|
+
with pytest.raises((KeyError, TypeError)):
|
|
128
|
+
_OuterTuple().fromJsonDict(data)
|
|
129
|
+
|
|
130
|
+
|
|
131
|
+
def test_from_json_dict_extra_key_raises_validation_error() -> None:
|
|
132
|
+
data = dict(
|
|
133
|
+
inner=dict(fieldMap=dict(), color="red", extra=1),
|
|
134
|
+
inners=[],
|
|
135
|
+
optInner=None,
|
|
136
|
+
)
|
|
137
|
+
with pytest.raises((KeyError, TypeError)):
|
|
138
|
+
_OuterTuple().fromJsonDict(data)
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
def test_from_json_dict_non_dict_for_tuple_typed_field_raises() -> None:
|
|
142
|
+
data = dict(inner="not-a-dict", inners=[], optInner=None)
|
|
143
|
+
with pytest.raises(ValueError):
|
|
144
|
+
_OuterTuple().fromJsonDict(data)
|
|
@@ -12,9 +12,9 @@ import functools
|
|
|
12
12
|
import logging
|
|
13
13
|
import types
|
|
14
14
|
import typing
|
|
15
|
-
from base64 import
|
|
15
|
+
from base64 import b64decode, b64encode
|
|
16
16
|
from collections import defaultdict
|
|
17
|
-
from datetime import UTC,
|
|
17
|
+
from datetime import UTC, date, datetime
|
|
18
18
|
|
|
19
19
|
import pytz
|
|
20
20
|
from sqlalchemy.orm.collections import InstrumentedList
|
|
@@ -114,15 +114,15 @@ def convertFromWkbElement(value):
|
|
|
114
114
|
|
|
115
115
|
|
|
116
116
|
def serialiseWkb(wkb: WKBElement) -> str:
|
|
117
|
-
from geoalchemy2.shape import to_shape
|
|
118
117
|
import shapely
|
|
118
|
+
from geoalchemy2.shape import to_shape
|
|
119
119
|
|
|
120
120
|
return b64encode(shapely.wkb.dumps(to_shape(wkb))).decode()
|
|
121
121
|
|
|
122
122
|
|
|
123
123
|
def deserialiseWkb(wkbB64Data: str) -> WKBElement:
|
|
124
|
-
from geoalchemy2.shape import from_shape
|
|
125
124
|
import shapely
|
|
125
|
+
from geoalchemy2.shape import from_shape
|
|
126
126
|
|
|
127
127
|
return from_shape(shapely.wkb.loads(b64decode(wkbB64Data)))
|
|
128
128
|
|
|
@@ -253,9 +253,7 @@ def fromStr(val: str, typeName: str):
|
|
|
253
253
|
if typeName == T_DATETIME:
|
|
254
254
|
# TODO: Check with ISO8601_JS_REGEXP
|
|
255
255
|
if len(val) == len("2017-06-06T09:40:37.097Z"):
|
|
256
|
-
return datetime.strptime(val, ISO8601_JS_FORMAT).replace(
|
|
257
|
-
tzinfo=pytz.UTC
|
|
258
|
-
)
|
|
256
|
+
return datetime.strptime(val, ISO8601_JS_FORMAT).replace(tzinfo=pytz.UTC)
|
|
259
257
|
|
|
260
258
|
if len(val) <= len("2017-06-06 09:40:37.097068"):
|
|
261
259
|
raise ValueError(
|
|
@@ -286,7 +284,7 @@ def fromRapuiType(typeName: str):
|
|
|
286
284
|
return TYPE_MAP_RAPUI_TO_PY[typeName]
|
|
287
285
|
|
|
288
286
|
|
|
289
|
-
@functools.
|
|
287
|
+
@functools.cache
|
|
290
288
|
def utilTypeHintsForClass(cls: type) -> dict[str, typing.Any]:
|
|
291
289
|
"""Resolved type hints for a class, cached per class.
|
|
292
290
|
|
|
@@ -328,6 +326,29 @@ def utilEnumClassFromTypeHint(typeHint: typing.Any) -> type[enum.Enum] | None:
|
|
|
328
326
|
return None
|
|
329
327
|
|
|
330
328
|
|
|
329
|
+
def utilTupleClassFromTypeHint(typeHint: typing.Any) -> type | None:
|
|
330
|
+
"""The ``vortex.Tuple`` subclass for a field type hint, or None.
|
|
331
|
+
|
|
332
|
+
Handles bare ``SomeTuple``, ``SomeTuple | None`` and
|
|
333
|
+
``Optional[SomeTuple]``; every other hint returns None.
|
|
334
|
+
"""
|
|
335
|
+
from vortex.Tuple import Tuple
|
|
336
|
+
|
|
337
|
+
if typeHint is None:
|
|
338
|
+
return None
|
|
339
|
+
|
|
340
|
+
if isinstance(typeHint, type) and issubclass(typeHint, Tuple):
|
|
341
|
+
return typeHint
|
|
342
|
+
|
|
343
|
+
origin = typing.get_origin(typeHint)
|
|
344
|
+
if origin in (typing.Union, types.UnionType):
|
|
345
|
+
for arg in typing.get_args(typeHint):
|
|
346
|
+
if isinstance(arg, type) and issubclass(arg, Tuple):
|
|
347
|
+
return arg
|
|
348
|
+
|
|
349
|
+
return None
|
|
350
|
+
|
|
351
|
+
|
|
331
352
|
def toRapuiType(value):
|
|
332
353
|
if value is None:
|
|
333
354
|
return V_NULL
|
|
@@ -26,6 +26,7 @@ from vortex.tuple_test_fixtures import (
|
|
|
26
26
|
BsonObjectTypeE,
|
|
27
27
|
BsonOptionalDatetimeTestTuple,
|
|
28
28
|
BsonOptionalFloatTestTuple,
|
|
29
|
+
BsonOptionalListTestTuple,
|
|
29
30
|
BsonPriorityE,
|
|
30
31
|
BsonTestTuple,
|
|
31
32
|
makeBsonTestTuple,
|
|
@@ -71,6 +72,28 @@ class TupleBsonTest(unittest.TestCase):
|
|
|
71
72
|
self.assertEqual(deserialisedTuple.requiredFloat, 151.0)
|
|
72
73
|
self.assertEqual(deserialisedTuple.optionalFloat, 0.0)
|
|
73
74
|
|
|
75
|
+
def testOptionalStrListRoundTrip(self) -> None:
|
|
76
|
+
origTuple = BsonOptionalListTestTuple(optionalStrList=["low", "high"])
|
|
77
|
+
bsonDict = origTuple.tupleToBsonJsonDict()
|
|
78
|
+
deserialisedTuple = Tuple.bsonJsonDictToTupleWithValidation(
|
|
79
|
+
bsonDict, BsonOptionalListTestTuple
|
|
80
|
+
)
|
|
81
|
+
self.assertEqual(deserialisedTuple.optionalStrList, ["low", "high"])
|
|
82
|
+
|
|
83
|
+
def testOptionalStrListNoneRoundTrip(self) -> None:
|
|
84
|
+
origTuple = BsonOptionalListTestTuple(optionalStrList=None)
|
|
85
|
+
bsonDict = origTuple.tupleToBsonJsonDict()
|
|
86
|
+
deserialisedTuple = Tuple.bsonJsonDictToTupleWithValidation(
|
|
87
|
+
bsonDict, BsonOptionalListTestTuple
|
|
88
|
+
)
|
|
89
|
+
self.assertIsNone(deserialisedTuple.optionalStrList)
|
|
90
|
+
|
|
91
|
+
def testOptionalStrListAbsentDecodesToNone(self) -> None:
|
|
92
|
+
deserialisedTuple = Tuple.bsonJsonDictToTupleWithValidation(
|
|
93
|
+
{}, BsonOptionalListTestTuple
|
|
94
|
+
)
|
|
95
|
+
self.assertIsNone(deserialisedTuple.optionalStrList)
|
|
96
|
+
|
|
74
97
|
def testBsonFractionalDoubleParsesAsIntFieldWithWarning(self) -> None:
|
|
75
98
|
bsonDict = validBsonDict()
|
|
76
99
|
bsonDict["aInt"] = 151.7
|
|
@@ -421,12 +421,8 @@ class TupleDocumentConverterBase:
|
|
|
421
421
|
return cls._makeError(field_path, str(exc), ValueError)
|
|
422
422
|
return None
|
|
423
423
|
|
|
424
|
-
if isinstance(value, list):
|
|
425
|
-
|
|
426
|
-
return None
|
|
427
|
-
for unionArg in get_args(typeHint):
|
|
428
|
-
if get_origin(unionArg) is list:
|
|
429
|
-
return None
|
|
424
|
+
if isinstance(value, list) and get_origin(typeHint) is list:
|
|
425
|
+
return None
|
|
430
426
|
|
|
431
427
|
if isinstance(value, dict):
|
|
432
428
|
if get_origin(typeHint) is dict:
|
|
@@ -717,6 +713,17 @@ class TupleDocumentConverterBase:
|
|
|
717
713
|
errors.append(intError)
|
|
718
714
|
return _ConvertResult(_UNSET, errors)
|
|
719
715
|
|
|
716
|
+
# Narrow ``list[X] | None`` unions to the list hint for list values
|
|
717
|
+
# so _checkType and _convertListCollecting see the item hint.
|
|
718
|
+
if isinstance(value, list) and get_origin(typeHint) is not list:
|
|
719
|
+
unionListArgs = [
|
|
720
|
+
unionArg
|
|
721
|
+
for unionArg in get_args(typeHint)
|
|
722
|
+
if get_origin(unionArg) is list
|
|
723
|
+
]
|
|
724
|
+
if unionListArgs:
|
|
725
|
+
typeHint = unionListArgs[0]
|
|
726
|
+
|
|
720
727
|
typeError = cls._checkType(
|
|
721
728
|
TupleClass, field_path, fieldName, typeHint, value, validator
|
|
722
729
|
)
|
|
@@ -108,6 +108,11 @@ class CachedSubscribedData:
|
|
|
108
108
|
def tuples(self, tuples: list[Tuple]) -> None:
|
|
109
109
|
self.touch()
|
|
110
110
|
self._tuples = tuples
|
|
111
|
+
if self.subject.is_disposed:
|
|
112
|
+
# RxJS parity: emitting after disposal is a silent no-op — a
|
|
113
|
+
# late redelivery after teardown must not crash the payload
|
|
114
|
+
# path with DisposedException.
|
|
115
|
+
return
|
|
111
116
|
self.subject.on_next(tuples)
|
|
112
117
|
|
|
113
118
|
def touch(self) -> None:
|
|
@@ -123,6 +128,8 @@ class CachedSubscribedData:
|
|
|
123
128
|
self.lastServerAskDate = None
|
|
124
129
|
self.lastServerPayloadDate = None
|
|
125
130
|
self._tuples = None
|
|
131
|
+
if self.subject.is_disposed:
|
|
132
|
+
return
|
|
126
133
|
self.subject.on_next(None)
|
|
127
134
|
|
|
128
135
|
|
|
@@ -286,6 +293,20 @@ class TupleDataOfflineObserverService:
|
|
|
286
293
|
cachedData.flush()
|
|
287
294
|
self._cleanupDeadCaches()
|
|
288
295
|
|
|
296
|
+
def unsubscribeAndEvictCache(self, tupleSelector: TupleSelector) -> None:
|
|
297
|
+
"""Evict one selector's cached data and unsubscribe it from the server.
|
|
298
|
+
|
|
299
|
+
The selector's cached data is dropped from the in-memory cache
|
|
300
|
+
entirely — unlike :meth:`flushCache`, which keeps the cache entry
|
|
301
|
+
for later reuse — and an unsubscribe is sent to the server, queued
|
|
302
|
+
while the vortex is offline and flushed on reconnect.
|
|
303
|
+
|
|
304
|
+
:param tupleSelector: The tuple selector to evict and unsubscribe.
|
|
305
|
+
"""
|
|
306
|
+
tsStr = tupleSelector.toJsonStr()
|
|
307
|
+
self._cacheByTupleSelector.pop(tsStr, None)
|
|
308
|
+
self._utilSendUnsubscribeToServer([tupleSelector])
|
|
309
|
+
|
|
289
310
|
def promiseFromTupleSelector(
|
|
290
311
|
self,
|
|
291
312
|
tupleSelector: TupleSelector,
|
|
@@ -21,6 +21,7 @@ from twisted.internet import reactor, task
|
|
|
21
21
|
from twisted.internet.defer import Deferred, DeferredList, succeed
|
|
22
22
|
|
|
23
23
|
from vortex.handler.TupleDataOfflineObserverService import (
|
|
24
|
+
CachedSubscribedData,
|
|
24
25
|
TupleDataOfflineObserverService,
|
|
25
26
|
)
|
|
26
27
|
from vortex.Payload import Payload
|
|
@@ -159,8 +160,19 @@ def _makeService(
|
|
|
159
160
|
)
|
|
160
161
|
|
|
161
162
|
|
|
162
|
-
|
|
163
|
-
|
|
163
|
+
def test_disposed_subject_drops_late_payload_silently() -> None:
|
|
164
|
+
cached = CachedSubscribedData(_makeSelector())
|
|
165
|
+
cached.subject.dispose()
|
|
166
|
+
|
|
167
|
+
cached.tuples = _makeTuples("late")
|
|
168
|
+
assert [t.aString for t in cached.tuples] == ["late"], (
|
|
169
|
+
"the cache still records the payload — only the subject emission"
|
|
170
|
+
" is skipped after disposal (RxJS parity: no DisposedException)"
|
|
171
|
+
)
|
|
172
|
+
|
|
173
|
+
cached.flush() # must not raise DisposedException either
|
|
174
|
+
|
|
175
|
+
|
|
164
176
|
async def test_offline_subscribe_emits_stored_tuples(tmp_path, monkeypatch) -> None:
|
|
165
177
|
storage = await _makeStorage(tmp_path)
|
|
166
178
|
tupleSelector = _makeSelector()
|
|
@@ -413,6 +425,41 @@ async def test_flush_timer_and_flush_cache(tmp_path, monkeypatch) -> None:
|
|
|
413
425
|
service.shutdown()
|
|
414
426
|
|
|
415
427
|
|
|
428
|
+
@pytest.mark.twisted
|
|
429
|
+
@ensureDeferred
|
|
430
|
+
async def test_unsubscribeAndEvictCache_evicts_and_sends_unsubscribe(
|
|
431
|
+
tmp_path, monkeypatch
|
|
432
|
+
) -> None:
|
|
433
|
+
tupleSelector = _makeSelector()
|
|
434
|
+
|
|
435
|
+
harness = _VortexHarness(monkeypatch)
|
|
436
|
+
harness.goOnline()
|
|
437
|
+
|
|
438
|
+
service = _makeService(None)
|
|
439
|
+
collector = _EmissionCollector()
|
|
440
|
+
subscription = service.subscribeToTupleSelector(tupleSelector).subscribe(collector)
|
|
441
|
+
try:
|
|
442
|
+
tsStr = tupleSelector.toJsonStr()
|
|
443
|
+
assert tsStr in service._cacheByTupleSelector, (
|
|
444
|
+
"a live subscription holds a cache entry for its selector"
|
|
445
|
+
)
|
|
446
|
+
|
|
447
|
+
service.unsubscribeAndEvictCache(tupleSelector)
|
|
448
|
+
|
|
449
|
+
assert tsStr not in service._cacheByTupleSelector, (
|
|
450
|
+
"the evicted selector's cached data is dropped from the cache"
|
|
451
|
+
" entirely — unlike flushCache, which retains the entry"
|
|
452
|
+
)
|
|
453
|
+
unsubscribeEnvelopes = [
|
|
454
|
+
e for e in harness.sentEnvelopes() if e.filt["unsubscribe"] is True
|
|
455
|
+
]
|
|
456
|
+
assert len(unsubscribeEnvelopes) == 1
|
|
457
|
+
assert unsubscribeEnvelopes[0].filt["tupleSelector"] == tupleSelector
|
|
458
|
+
finally:
|
|
459
|
+
subscription.dispose()
|
|
460
|
+
service.shutdown()
|
|
461
|
+
|
|
462
|
+
|
|
416
463
|
@pytest.mark.twisted
|
|
417
464
|
@ensureDeferred
|
|
418
465
|
async def test_pending_unsubscribe_flushes_on_reconnect(tmp_path, monkeypatch) -> None:
|
|
@@ -172,6 +172,12 @@ class BsonOptionalDatetimeTestTuple(Tuple):
|
|
|
172
172
|
optionalDate: datetime | None = TupleField()
|
|
173
173
|
|
|
174
174
|
|
|
175
|
+
@addTupleType
|
|
176
|
+
class BsonOptionalListTestTuple(Tuple):
|
|
177
|
+
__tupleType__ = "flyingion.vortex.BsonOptionalListTestTuple"
|
|
178
|
+
optionalStrList: list[str] | None = TupleField(None)
|
|
179
|
+
|
|
180
|
+
|
|
175
181
|
@addTupleType
|
|
176
182
|
class BsonDatetimeFormatTestTuple(Tuple):
|
|
177
183
|
__tupleType__ = "flyingion.vortex.BsonDatetimeFormatTestTuple"
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
LICENSE
|
|
1
2
|
README.md
|
|
2
3
|
pyproject.toml
|
|
3
4
|
example/TwistedDeferredTimeout.py
|
|
@@ -14,6 +15,7 @@ vortex/DataWrapTuple.py
|
|
|
14
15
|
vortex/DeferUtil.py
|
|
15
16
|
vortex/DeferUtil_test.py
|
|
16
17
|
vortex/Jsonable.py
|
|
18
|
+
vortex/Jsonable_tuple_dict_coercion_test.py
|
|
17
19
|
vortex/MtlsAuthorizedClientRegistry.py
|
|
18
20
|
vortex/MtlsAuthorizedClientRegistry_test.py
|
|
19
21
|
vortex/MtlsServerSslOptions.py
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|