start logging session id

avidale · Feb 26, 2021 · ae77f5b · ae77f5b
1 parent 77f0bda
commit ae77f5b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git a/tgalice/adapters/alice.py b/tgalice/adapters/alice.py
@@ -41,6 +41,7 @@ def make_context(self, message: Dict, **kwargs) -> Context:
             message_text=message_text,
             metadata=metadata,
             user_id=user_id,
+            session_id=sess.get('session_id'),
             source=self.SOURCE,
             raw_message=message,
         )

diff --git a/tgalice/adapters/base.py b/tgalice/adapters/base.py
@@ -31,6 +31,7 @@ def serialize_context(self, context: Context, data=None, **kwargs) -> Optional[S
             from_user=True,
             data=data,
             source=context.source,
+            session_id=context.session_id,
             **kwargs
         )
 
@@ -46,6 +47,7 @@ def serialize_response(self, data, context: Context, response: Response, **kwarg
             from_user=False,
             data=data,
             source=context.source,
+            session_id=context.session_id,
             **kwargs
         )
 

diff --git a/tgalice/adapters/facebook.py b/tgalice/adapters/facebook.py
@@ -8,11 +8,13 @@ class FacebookAdapter(BaseAdapter):
     SOURCE = SOURCES.FACEBOOK
 
     def make_context(self, message: Dict, **kwargs) -> Context:
+        uid = self.SOURCE + '__' + message['sender']['id']
         ctx = Context(
             user_object=None,
             message_text=message.get('message', {}).get('text', ''),
             metadata={},
-            user_id=self.SOURCE + '__' + message['sender']['id'],
+            user_id=uid,
+            session_id=uid,
             source=self.SOURCE,
             raw_message=message,
         )

diff --git a/tgalice/adapters/salut.py b/tgalice/adapters/salut.py
@@ -20,7 +20,7 @@ def make_context(self, message: Dict, **kwargs) -> Context:
         payload = message.get('payload') or {}
         pm = payload.get('message')
 
-        user_id = user.get('userId')
+        user_id = self.SOURCE + '__' + user.get('userId')
 
         message_text = (pm or {}).get('original_text') or ''
 
@@ -31,6 +31,7 @@ def make_context(self, message: Dict, **kwargs) -> Context:
             message_text=message_text,
             metadata=metadata,
             user_id=user_id,
+            session_id=message.get('sessionId'),
             source=self.SOURCE,
             raw_message=message,
         )

diff --git a/tgalice/adapters/text.py b/tgalice/adapters/text.py
@@ -13,6 +13,7 @@ def make_context(self, message: Dict, **kwargs) -> Context:
             message_text=message,
             metadata={},
             user_id='the_text_user',
+            session_id='the_text_session',
             source=self.SOURCE,
             raw_message=message,
         )

diff --git a/tgalice/adapters/tg.py b/tgalice/adapters/tg.py
@@ -16,11 +16,13 @@ def __init__(self, suggest_cols=1, **kwargs):
         self.suggest_cols = suggest_cols
 
     def make_context(self, message: Message, **kwargs) -> Context:
+        uid = self.SOURCE + '__' + str(message.from_user.id)
         ctx = Context(
             user_object=None,
             message_text=message.text,
             metadata={},
-            user_id=self.SOURCE + '__' + str(message.from_user.id),
+            user_id=uid,
+            session_id=uid,
             source=self.SOURCE,
             raw_message=message,
         )

diff --git a/tgalice/adapters/vk.py b/tgalice/adapters/vk.py
@@ -13,11 +13,13 @@ def __init__(self, suggest_cols=1, **kwargs):
         self.suggest_cols = suggest_cols
 
     def make_context(self, message, **kwargs) -> Context:
+        uid = self.SOURCE + '__' + str(message.user_id)
         ctx = Context(
             user_object=None,
             message_text=message.text,
             metadata={},
-            user_id=self.SOURCE + '__' + str(message.user_id),
+            user_id=uid,
+            session_id=uid,
             source=self.SOURCE,
             raw_message=message,
         )

diff --git a/tgalice/dialog/context.py b/tgalice/dialog/context.py
@@ -15,12 +15,14 @@ class Context:
     def __init__(
             self, user_object, message_text, metadata, request_id=None, user_id=None, source=None, raw_message=None,
             request_type=REQUEST_TYPES.SIMPLE_UTTERANCE, payload=None, yandex=None,
+            session_id=None,
     ):
         self._user_object = copy.deepcopy(user_object)
         self.message_text = message_text
         self.metadata = metadata
         self.request_id = request_id or str(uuid.uuid1())
         self.user_id = user_id
+        self.session_id = session_id
         self.source = source
         self.raw_message = raw_message
         self.request_type = request_type

diff --git a/tgalice/dialog/serialized_message.py b/tgalice/dialog/serialized_message.py
@@ -3,11 +3,12 @@
 
 class SerializedMessage:
     # a base class for e.g. logging messages
-    def __init__(self, text, user_id, from_user, timestamp=None, **kwargs):
+    def __init__(self, text, user_id, from_user, timestamp=None, session_id=None, **kwargs):
         self.text = text
         self.user_id = user_id
         self.from_user = from_user
         self.timestamp = timestamp or str(datetime.utcnow())
+        self.session_id = session_id
         self.kwargs = kwargs
         """
         Expected kwargs:
@@ -28,7 +29,8 @@ def to_dict(self):
             'text': self.text,
             'user_id': self.user_id,
             'from_user': self.from_user,
-            'timestamp': self.timestamp
+            'timestamp': self.timestamp,
+            'session_id': self.session_id,
         }
         for k, v in self.kwargs.items():
             if k not in result: