Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions alignai/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from requests.exceptions import RequestException

from alignai.exception import APIError
from alignai.ingestion.v1alpha.event_pb2 import Event
from alignai.ingestion.v1alpha.ingestion_pb2 import CollectEventsRequest
from alignai.proto.ingestion.v1alpha.event_pb2 import Event
from alignai.proto.ingestion.v1alpha.ingestion_pb2 import CollectEventsRequest


class APIClient:
Expand Down
2 changes: 1 addition & 1 deletion alignai/buffer_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from threading import Condition, Lock

from alignai.ingestion.v1alpha.event_pb2 import Event
from alignai.proto.ingestion.v1alpha.event_pb2 import Event


class BufferStorage:
Expand Down
18 changes: 8 additions & 10 deletions alignai/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import os
import uuid
from datetime import datetime

import pendulum
from datetime import datetime, timezone

from alignai.proto.ingestion.v1alpha.event_pb2 import Event, EventProperties
from alignai.api_client import APIClient
from alignai.buffer_storage import BufferStorage
from alignai.config import Config
Expand All @@ -18,7 +17,6 @@
SERVER_BASE_URL,
EventTypes,
)
from alignai.ingestion.v1alpha.event_pb2 import Event, EventProperties
from alignai.logger import get_logger
from alignai.utils import (
CustomProperties,
Expand Down Expand Up @@ -100,7 +98,7 @@ def open_session(
open_session_event = Event(
id=uuid.uuid4().hex,
type=EventTypes.SESSION_OPEN,
create_time=datetime_to_timestamp(pendulum.now()),
create_time=datetime_to_timestamp(datetime.now(timezone.utc)),
properties=EventProperties(
session_properties=EventProperties.SessionProperties(**session_properties_args),
custom_properties=serialize_custom_properties(custom_properties) if custom_properties else None,
Expand All @@ -120,7 +118,7 @@ def close_session(self, session_id: str) -> None:
close_session_event = Event(
id=uuid.uuid4().hex,
type=EventTypes.SESSION_CLOSE,
create_time=datetime_to_timestamp(pendulum.now()),
create_time=datetime_to_timestamp(datetime.now(timezone.utc)),
properties=EventProperties(session_properties=EventProperties.SessionProperties(session_id=session_id)),
project_id=self.project_id,
)
Expand Down Expand Up @@ -172,7 +170,7 @@ def identify_user(
identify_user_event = Event(
id=uuid.uuid4().hex,
type=EventTypes.USER_RECOGNIZE,
create_time=datetime_to_timestamp(pendulum.now()),
create_time=datetime_to_timestamp(datetime.now(timezone.utc)),
properties=EventProperties(
user_properties=EventProperties.UserProperties(**user_properties_args),
custom_properties=serialize_custom_properties(custom_properties) if custom_properties else None,
Expand Down Expand Up @@ -211,7 +209,7 @@ def create_message(
create_message_event = Event(
id=uuid.uuid4().hex,
type=EventTypes.MESSAGE_CREATE,
create_time=datetime_to_timestamp(pendulum.now()),
create_time=datetime_to_timestamp(datetime.now(timezone.utc)),
properties=EventProperties(
message_properties=EventProperties.MessageProperties(
session_id=session_id,
Expand Down Expand Up @@ -249,7 +247,7 @@ def create_session_feedback(
create_feedback_event = Event(
id=uuid.uuid4().hex,
type=EventTypes.MESSAGE_CREATE,
create_time=datetime_to_timestamp(pendulum.now()),
create_time=datetime_to_timestamp(datetime.now(timezone.utc)),
properties=EventProperties(
feedback_properties=EventProperties.FeedbackProperties(
session_id=session_id,
Expand Down Expand Up @@ -285,7 +283,7 @@ def create_message_feedback(
create_feedback_event = Event(
id=uuid.uuid4().hex,
type=EventTypes.MESSAGE_CREATE,
create_time=datetime_to_timestamp(pendulum.now()),
create_time=datetime_to_timestamp(datetime.now(timezone.utc)),
properties=EventProperties(
feedback_properties=EventProperties.FeedbackProperties(
session_id=session_id,
Expand Down
Empty file added alignai/proto/__init__.py
Empty file.
Empty file.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from google.api import field_behavior_pb2 as _field_behavior_pb2
from google.protobuf import empty_pb2 as _empty_pb2
from alignai.ingestion.v1alpha import event_pb2 as _event_pb2
from google.protobuf.internal import containers as _containers
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union

from alignai.proto.ingestion.v1alpha import event_pb2 as _event_pb2

DESCRIPTOR: _descriptor.FileDescriptor

class CollectEventsRequest(_message.Message):
Expand Down
7 changes: 3 additions & 4 deletions alignai/utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from datetime import datetime
from typing import Mapping
from typing import Mapping, Dict

from google.protobuf.timestamp_pb2 import Timestamp

from alignai.ingestion.v1alpha.event_pb2 import EventProperties
from alignai.proto.ingestion.v1alpha.event_pb2 import EventProperties


def datetime_to_timestamp(dt: datetime) -> Timestamp:
Expand All @@ -12,7 +11,7 @@ def datetime_to_timestamp(dt: datetime) -> Timestamp:
return timestamp


CustomProperties = dict[str, str]
CustomProperties = Dict[str, str]


def serialize_custom_properties(
Expand Down
5 changes: 4 additions & 1 deletion alignai/validate.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from typing import Dict


class ValidationError(ValueError):
def __init__(self, message: str):
self.message = message
Expand All @@ -20,7 +23,7 @@ def validate_user_id_or_raise(user_id: str):
raise ValidationError("user_id must be at most 64 characters")


def validate_custom_properties_or_raise(custom_properties: dict[str, str]):
def validate_custom_properties_or_raise(custom_properties: Dict[str, str]):
if len(custom_properties) > 10:
raise ValidationError("custom_properties must have at most 10 keys")
for key, value in custom_properties.items():
Expand Down
Loading