rasa-pro 3.10.15__py3-none-any.whl → 3.11.0__py3-none-any.whl

rasa/engine/storage/local_model_storage.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import shutil
 import sys
 import tempfile
@@ -7,21 +8,19 @@ import uuid
 from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
-from typing import Generator, Optional, Text, Tuple, Union
-
-import structlog
 from tarsafe import TarSafe
+from typing import Generator, Optional, Text, Tuple, Union
 
-import rasa.model
-import rasa.shared.utils.io
 import rasa.utils.common
+import rasa.shared.utils.io
+from rasa.engine.storage.storage import ModelMetadata, ModelStorage
 from rasa.engine.graph import GraphModelConfiguration
 from rasa.engine.storage.resource import Resource
-from rasa.engine.storage.storage import ModelMetadata, ModelStorage
 from rasa.exceptions import UnsupportedModelVersionError
 from rasa.shared.core.domain import Domain
+import rasa.model
 
-structlogger = structlog.get_logger()
+logger = logging.getLogger(__name__)
 
 # Paths within model archive
 MODEL_ARCHIVE_COMPONENTS_DIR = "components"
@@ -87,14 +86,7 @@ class LocalModelStorage(ModelStorage):
             cls._extract_archive_to_directory(
                 model_archive_path, temporary_directory_path
             )
-            structlogger.debug(
-                "local_model_storage.from_model_archive",
-                event_info=(
-                    f"Extracted model '{model_archive_path}' to "
-                    f"'{temporary_directory_path}'."
-                ),
-            )
-
+            logger.debug(f"Extracted model to '{temporary_directory_path}'.")
             cls._initialize_model_storage_from_model_archive(
                 temporary_directory_path, storage_path
             )
@@ -150,10 +142,6 @@ class LocalModelStorage(ModelStorage):
         temporary_directory: Path, storage_path: Path
     ) -> None:
         for path in (temporary_directory / MODEL_ARCHIVE_COMPONENTS_DIR).glob("*"):
-            structlogger.debug(
-                "local_model_storage._initialize_model_storage_from_model_archive",
-                event_info=f"Moving '{path}' to '{storage_path}'.",
-            )
             shutil.move(str(path), str(storage_path))
 
     @staticmethod
@@ -167,10 +155,7 @@ class LocalModelStorage(ModelStorage):
     @contextmanager
     def write_to(self, resource: Resource) -> Generator[Path, None, None]:
         """Persists data for a resource (see parent class for full docstring)."""
-        structlogger.debug(
-            "local_model_storage.write_to.resource_write_requested",
-            event_info=f"Resource '{resource.name}' was requested for writing.",
-        )
+        logger.debug(f"Resource '{resource.name}' was requested for writing.")
         directory = self._directory_for_resource(resource)
 
         if not directory.exists():
@@ -178,10 +163,7 @@ class LocalModelStorage(ModelStorage):
 
         yield directory
 
-        structlogger.debug(
-            "local_model_storage.write_to.resource_persisted",
-            event_info=f"Resource '{resource.name}' was persisted.",
-        )
+        logger.debug(f"Resource '{resource.name}' was persisted.")
 
     def _directory_for_resource(self, resource: Resource) -> Path:
         return self._storage_path / resource.name
@@ -189,10 +171,7 @@ class LocalModelStorage(ModelStorage):
     @contextmanager
     def read_from(self, resource: Resource) -> Generator[Path, None, None]:
         """Provides the data of a `Resource` (see parent class for full docstring)."""
-        structlogger.debug(
-            "local_model_storage.read_from",
-            event_info=f"Resource '{resource.name}' was requested for reading.",
-        )
+        logger.debug(f"Resource '{resource.name}' was requested for reading.")
         directory = self._directory_for_resource(resource)
 
         if not directory.exists():
@@ -214,12 +193,7 @@ class LocalModelStorage(ModelStorage):
         domain: Domain,
     ) -> ModelMetadata:
         """Creates model package (see parent class for full docstring)."""
-        structlogger.debug(
-            "local_model_storage.create_model_package.started",
-            event_info=(
-                f"Start to created model " f"package for path '{model_archive_path}'.",
-            ),
-        )
+        logger.debug(f"Start to created model package for path '{model_archive_path}'.")
 
         with windows_safe_temporary_directory() as temp_dir:
             temporary_directory = Path(temp_dir)
@@ -240,10 +214,7 @@ class LocalModelStorage(ModelStorage):
             with TarSafe.open(model_archive_path, "w:gz") as tar:
                 tar.add(temporary_directory, arcname="")
 
-        structlogger.debug(
-            "local_model_storage.create_model_package.finished",
-            event_info=f"Model package created in path '{model_archive_path}'.",
-        )
+        logger.debug(f"Model package created in path '{model_archive_path}'.")
 
         return model_metadata
 
@@ -267,7 +238,6 @@ class LocalModelStorage(ModelStorage):
             predict_schema=model_configuration.predict_schema,
             training_type=model_configuration.training_type,
             project_fingerprint=rasa.model.project_fingerprint(),
-            spaces=model_configuration.spaces,
             language=model_configuration.language,
             core_target=model_configuration.core_target,
             nlu_target=model_configuration.nlu_target,

rasa/engine/storage/storage.py

@@ -6,7 +6,7 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import List, Tuple, Union, Text, Generator, Dict, Any, Optional
+from typing import Tuple, Union, Text, Generator, Dict, Any, Optional
 from packaging import version
 
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
@@ -140,7 +140,6 @@ class ModelMetadata:
     core_target: Optional[Text]
     nlu_target: Text
     language: Optional[Text]
-    spaces: Optional[List[Dict[Text, Any]]] = None
     training_type: TrainingType = TrainingType.BOTH
 
     def __post_init__(self) -> None:
@@ -170,7 +169,6 @@ class ModelMetadata:
             "core_target": self.core_target,
             "nlu_target": self.nlu_target,
             "language": self.language,
-            "spaces": self.spaces,
         }
 
     @classmethod
@@ -198,6 +196,4 @@ class ModelMetadata:
             core_target=serialized["core_target"],
             nlu_target=serialized["nlu_target"],
             language=serialized["language"],
-            # optional, since introduced later
-            spaces=serialized.get("spaces"),
         )