Workflow для тестов

.github/workflows/tests.yml

@@ -82,14 +82,14 @@ jobs:
           [[ "$IS_WINDOWS" == "false" ]] && flags="$flags --redis redis://localhost:6379/0"
           pytest $flags
 
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage.xml
-          flags: unittests
-          name: py-${{ matrix.python-version }}-${{ matrix.os }}
-          fail_ci_if_error: true
+  #      - name: Upload coverage data
+  #        uses: codecov/codecov-action@v3
+  #        with:
+  #          token: ${{ secrets.CODECOV_TOKEN }}
+  #          files: coverage.xml
+  #          flags: unittests
+  #          name: py-${{ matrix.python-version }}-${{ matrix.os }}
+  #          fail_ci_if_error: true
 
   pypy-tests:
     strategy:

aliceio/client/session/base.py

@@ -112,7 +112,7 @@ def prepare_value(  # noqa: C901
         value: Any,
         skill: Skill,
         files: Dict[str, Any],
-        _dumps_json: bool = True,
+        _dumps_json: bool = False,
     ) -> Any:
         """Подготовка значения перед отправкой."""
         if value is None:
@@ -162,7 +162,9 @@ def prepare_value(  # noqa: C901
         if isinstance(value, datetime.datetime):
             return str(round(value.timestamp()))
         if isinstance(value, Enum):
-            return self.prepare_value(value.value, skill=skill, files=files)
+            return self.prepare_value(
+                value.value, skill=skill, files=files, _dumps_json=True
+            )
 
         if _dumps_json:
             return self.json.dumps(value)

aliceio/dispatcher/dispatcher.py

@@ -224,7 +224,7 @@ async def _feed_webhook_update(
         except Exception as e:
             loggers.event.exception(
                 "Cause exception while process update "
-                "session=%s by skill id=%d\n%s: %s",
+                "session=%r by skill id=%r\n%s: %s",
                 update.session.session_id,
                 skill.id,
                 e.__class__.__name__,

aliceio/dispatcher/middlewares/user_context.py

@@ -6,7 +6,7 @@
 
 EVENT_FROM_USER_KEY = "event_from_user"
 EVENT_SESSION_KEY = "event_session"
-EVENT_UPDATE_KEY = "update"
+EVENT_UPDATE_KEY = "event_update"
 
 
 class UserContextMiddleware(BaseMiddleware):

aliceio/fsm/storage/redis.py

@@ -171,4 +171,4 @@ async def get_data(
             return {}
         if isinstance(value, bytes):
             value = value.decode("utf-8")
-        return cast(Dict[str, Any], self.json.dumps(value))
+        return cast(Dict[str, Any], self.json.loads(value))

tests/test_dispatcher/test_middlewares/test_user_context.py

@@ -32,6 +32,14 @@ async def test_call(self, update: Update) -> None:
 
         assert data["event_session"] == 1
         assert data["event_from_user"] == 2
+        assert data["event_update"] == update
+
+        data.clear()
+        await middleware(next_handler, update, data)
+
+        assert data["event_session"] == update.session
+        assert data["event_from_user"] == update.session.user
+        assert data["event_update"] == update
 
     async def test_resolve_context(self) -> None:
         user = User(user_id="42", access_token="24")

tests/test_utils/test_mixins.py

@@ -1,4 +1,5 @@
 import contextvars
+import platform
 
 import pytest
 
@@ -105,5 +106,9 @@ class MyClass(ContextInstanceMixin):
 
         wrong_type_token = "wrong_type"
 
-        with pytest.raises(TypeError):
-            MyClass.reset_current(wrong_type_token)
+        if platform.python_implementation() == "PyPy":
+            with pytest.raises(AttributeError):
+                MyClass.reset_current(wrong_type_token)
+        else:
+            with pytest.raises(TypeError):
+                MyClass.reset_current(wrong_type_token)