From de42f8418eb1ec84dda7bd19d186397126ef5ca6 Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Tue, 8 Oct 2024 07:48:28 +0000 Subject: [PATCH 1/9] remove pendulum from dep --- poetry.lock | 72 +------------------------------------------------- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/poetry.lock b/poetry.lock index af8e3b2..91470f3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -390,40 +390,6 @@ files = [ {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, ] -[[package]] -name = "pendulum" -version = "2.1.2" -description = "Python datetimes made easy" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "pendulum-2.1.2-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:b6c352f4bd32dff1ea7066bd31ad0f71f8d8100b9ff709fb343f3b86cee43efe"}, - {file = "pendulum-2.1.2-cp27-cp27m-win_amd64.whl", hash = "sha256:318f72f62e8e23cd6660dbafe1e346950281a9aed144b5c596b2ddabc1d19739"}, - {file = "pendulum-2.1.2-cp35-cp35m-macosx_10_15_x86_64.whl", hash = "sha256:0731f0c661a3cb779d398803655494893c9f581f6488048b3fb629c2342b5394"}, - {file = "pendulum-2.1.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:3481fad1dc3f6f6738bd575a951d3c15d4b4ce7c82dce37cf8ac1483fde6e8b0"}, - {file = "pendulum-2.1.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9702069c694306297ed362ce7e3c1ef8404ac8ede39f9b28b7c1a7ad8c3959e3"}, - {file = "pendulum-2.1.2-cp35-cp35m-win_amd64.whl", hash = "sha256:fb53ffa0085002ddd43b6ca61a7b34f2d4d7c3ed66f931fe599e1a531b42af9b"}, - {file = "pendulum-2.1.2-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:c501749fdd3d6f9e726086bf0cd4437281ed47e7bca132ddb522f86a1645d360"}, - {file = "pendulum-2.1.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c807a578a532eeb226150d5006f156632df2cc8c5693d778324b43ff8c515dd0"}, - {file = "pendulum-2.1.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2d1619a721df661e506eff8db8614016f0720ac171fe80dda1333ee44e684087"}, - {file = "pendulum-2.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:f888f2d2909a414680a29ae74d0592758f2b9fcdee3549887779cd4055e975db"}, - {file = "pendulum-2.1.2-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:e95d329384717c7bf627bf27e204bc3b15c8238fa8d9d9781d93712776c14002"}, - {file = "pendulum-2.1.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:4c9c689747f39d0d02a9f94fcee737b34a5773803a64a5fdb046ee9cac7442c5"}, - {file = "pendulum-2.1.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:1245cd0075a3c6d889f581f6325dd8404aca5884dea7223a5566c38aab94642b"}, - {file = "pendulum-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:db0a40d8bcd27b4fb46676e8eb3c732c67a5a5e6bfab8927028224fbced0b40b"}, - {file = "pendulum-2.1.2-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:f5e236e7730cab1644e1b87aca3d2ff3e375a608542e90fe25685dae46310116"}, - {file = "pendulum-2.1.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:de42ea3e2943171a9e95141f2eecf972480636e8e484ccffaf1e833929e9e052"}, - {file = "pendulum-2.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7c5ec650cb4bec4c63a89a0242cc8c3cebcec92fcfe937c417ba18277d8560be"}, - {file = "pendulum-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:33fb61601083f3eb1d15edeb45274f73c63b3c44a8524703dc143f4212bf3269"}, - {file = "pendulum-2.1.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:29c40a6f2942376185728c9a0347d7c0f07905638c83007e1d262781f1e6953a"}, - {file = "pendulum-2.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:94b1fc947bfe38579b28e1cccb36f7e28a15e841f30384b5ad6c5e31055c85d7"}, - {file = "pendulum-2.1.2.tar.gz", hash = "sha256:b06a0ca1bfe41c990bbf0c029f0b6501a7f2ec4e38bfec730712015e8860f207"}, -] - -[package.dependencies] -python-dateutil = ">=2.6,<3.0" -pytzdata = ">=2020.1" - [[package]] name = "platformdirs" version = "4.3.3" @@ -478,31 +444,6 @@ files = [ {file = "protobuf-5.28.1.tar.gz", hash = "sha256:42597e938f83bb7f3e4b35f03aa45208d49ae8d5bcb4bc10b9fc825e0ab5e423"}, ] -[[package]] -name = "python-dateutil" -version = "2.9.0.post0" -description = "Extensions to the standard Python datetime module" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" -files = [ - {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"}, - {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"}, -] - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "pytzdata" -version = "2020.1" -description = "The Olson timezone database for Python." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "pytzdata-2020.1-py2.py3-none-any.whl", hash = "sha256:e1e14750bcf95016381e4d472bad004eef710f2d6417240904070b3d6654485f"}, - {file = "pytzdata-2020.1.tar.gz", hash = "sha256:3efa13b335a00a8de1d345ae41ec78dd11c9f8807f522d39850f2dd828681540"}, -] - [[package]] name = "pyyaml" version = "6.0.2" @@ -612,17 +553,6 @@ files = [ {file = "ruff-0.3.7.tar.gz", hash = "sha256:d5c1aebee5162c2226784800ae031f660c350e7a3402c4d1f8ea4e97e232e3ba"}, ] -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - [[package]] name = "tomli" version = "2.0.1" @@ -696,4 +626,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = ">=3.8.0,<4.0" -content-hash = "48a436f93fdd889c544355efe8de47b6d9bdffd38e9f91dc72dfebb706a8bca6" +content-hash = "0b2171e83f6714faf0afdca66f5d58dc2bc3b95ba5fee6d14c777add637c512f" diff --git a/pyproject.toml b/pyproject.toml index c0dcaca..01b00f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,6 @@ packages = [{include = "alignai"}] python = ">=3.8.0,<4.0" requests = "^2.31.0" protobuf = "^5.28.1" -pendulum = "^2.1.2" googleapis-googleapis-protocolbuffers-python = "^28.1.0.1.20240827201746+e7f8d366f526" googleapis-googleapis-protocolbuffers-pyi = "^28.1.0.1.20240827201746+e7f8d366f526" From 689ced1e5eafac7d3815ed1666395c8aba777100 Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Tue, 8 Oct 2024 07:48:39 +0000 Subject: [PATCH 2/9] bump package version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 01b00f6..c4f76e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "alignai" -version = "0.2.1" +version = "0.3.0.dev1" description = "Python SDK for Align AI" authors = ["Coxwave "] readme = "README.md" From aa5dec4b3b44e7ea3624f57f665e406eda03ee9b Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Tue, 8 Oct 2024 08:20:11 +0000 Subject: [PATCH 3/9] depends on buf registry --- alignai/api_client.py | 4 +- alignai/buffer_storage.py | 2 +- alignai/client.py | 2 +- alignai/ingestion/v1alpha/event_pb2.py | 123 ------------------- alignai/ingestion/v1alpha/event_pb2.pyi | 128 -------------------- alignai/ingestion/v1alpha/ingestion_pb2.py | 46 ------- alignai/ingestion/v1alpha/ingestion_pb2.pyi | 17 --- alignai/utils.py | 7 +- alignai/validate.py | 5 +- poetry.lock | 122 ++++++++++++------- pyproject.toml | 8 +- 11 files changed, 97 insertions(+), 367 deletions(-) delete mode 100644 alignai/ingestion/v1alpha/event_pb2.py delete mode 100644 alignai/ingestion/v1alpha/event_pb2.pyi delete mode 100644 alignai/ingestion/v1alpha/ingestion_pb2.py delete mode 100644 alignai/ingestion/v1alpha/ingestion_pb2.pyi diff --git a/alignai/api_client.py b/alignai/api_client.py index d8a70db..b5291e7 100644 --- a/alignai/api_client.py +++ b/alignai/api_client.py @@ -5,11 +5,11 @@ from urllib.parse import urljoin import requests +from ingestion.v1alpha.event_pb2 import Event +from ingestion.v1alpha.ingestion_pb2 import CollectEventsRequest 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 class APIClient: diff --git a/alignai/buffer_storage.py b/alignai/buffer_storage.py index 8fbff58..62943ea 100644 --- a/alignai/buffer_storage.py +++ b/alignai/buffer_storage.py @@ -2,7 +2,7 @@ from threading import Condition, Lock -from alignai.ingestion.v1alpha.event_pb2 import Event +from ingestion.v1alpha.event_pb2 import Event class BufferStorage: diff --git a/alignai/client.py b/alignai/client.py index 2c93d0d..8c137fd 100644 --- a/alignai/client.py +++ b/alignai/client.py @@ -5,6 +5,7 @@ from datetime import datetime import pendulum +from ingestion.v1alpha.event_pb2 import Event, EventProperties from alignai.api_client import APIClient from alignai.buffer_storage import BufferStorage @@ -18,7 +19,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, diff --git a/alignai/ingestion/v1alpha/event_pb2.py b/alignai/ingestion/v1alpha/event_pb2.py deleted file mode 100644 index aad5d5e..0000000 --- a/alignai/ingestion/v1alpha/event_pb2.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE -# source: ingestion/v1alpha/event.proto -# Protobuf Python Version: 5.28.1 -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -# from google.protobuf import runtime_version as _runtime_version -from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import builder as _builder -# _runtime_version.ValidateProtobufRuntimeVersion( -# _runtime_version.Domain.PUBLIC, -# 5, -# 28, -# 1, -# '', -# 'ingestion/v1alpha/event.proto' -# ) -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from google.api import field_behavior_pb2 as google_dot_api_dot_field__behavior__pb2 -from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dingestion/v1alpha/event.proto\x12\x11ingestion.v1alpha\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xe4\x01\n\x05\x45vent\x12\x13\n\x02id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x02id\x12\x17\n\x04type\x18\x02 \x01(\tB\x03\xe0\x41\x02R\x04type\x12@\n\x0b\x63reate_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\ncreateTime\x12G\n\nproperties\x18\x04 \x01(\x0b\x32\".ingestion.v1alpha.EventPropertiesB\x03\xe0\x41\x02R\nproperties\x12\"\n\nproject_id\x18\x05 \x01(\tB\x03\xe0\x41\x02R\tprojectId\"\x9e\x11\n\x0f\x45ventProperties\x12\x65\n\x12session_properties\x18\x01 \x01(\x0b\x32\x34.ingestion.v1alpha.EventProperties.SessionPropertiesH\x00R\x11sessionProperties\x12\x65\n\x12message_properties\x18\x02 \x01(\x0b\x32\x34.ingestion.v1alpha.EventProperties.MessagePropertiesH\x00R\x11messageProperties\x12\\\n\x0fuser_properties\x18\x03 \x01(\x0b\x32\x31.ingestion.v1alpha.EventProperties.UserPropertiesH\x00R\x0euserProperties\x12h\n\x13\x66\x65\x65\x64\x62\x61\x63k_properties\x18\x04 \x01(\x0b\x32\x35.ingestion.v1alpha.EventProperties.FeedbackPropertiesH\x00R\x12\x66\x65\x65\x64\x62\x61\x63kProperties\x12j\n\x11\x63ustom_properties\x18\n \x03(\x0b\x32\x38.ingestion.v1alpha.EventProperties.CustomPropertiesEntryB\x03\xe0\x41\x01R\x10\x63ustomProperties\x1a\xf6\x01\n\x11SessionProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12(\n\rsession_title\x18\x02 \x01(\tB\x03\xe0\x41\x01R\x0csessionTitle\x12M\n\x12session_start_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x10sessionStartTime\x12\x1c\n\x07user_id\x18\x04 \x01(\tB\x03\xe0\x41\x02R\x06userId\x12&\n\x0c\x61ssistant_id\x18\x05 \x01(\tB\x03\xe0\x41\x01R\x0b\x61ssistantId\x1a\xbc\x03\n\x11MessageProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12-\n\x0fmessage_id_hint\x18\x02 \x01(\tB\x05\x18\x01\xe0\x41\x01R\rmessageIdHint\x12\x31\n\x12message_index_hint\x18\x03 \x01(\x05\x42\x03\xe0\x41\x02R\x10messageIndexHint\x12\x61\n\x0cmessage_role\x18\x04 \x01(\x0e\x32\x39.ingestion.v1alpha.EventProperties.MessageProperties.RoleB\x03\xe0\x41\x02R\x0bmessageRole\x12,\n\x0fmessage_content\x18\x05 \x01(\tB\x03\xe0\x41\x02R\x0emessageContent\x12O\n\x13message_create_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x11messageCreateTime\"?\n\x04Role\x12\x14\n\x10ROLE_UNSPECIFIED\x10\x00\x12\r\n\tROLE_USER\x10\x01\x12\x12\n\x0eROLE_ASSISTANT\x10\x02\x1a\xba\x03\n\x0eUserProperties\x12\x1c\n\x07user_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x06userId\x12\"\n\nuser_email\x18\x02 \x01(\tB\x03\xe0\x41\x01R\tuserEmail\x12\x1c\n\x07user_ip\x18\x03 \x01(\tB\x03\xe0\x41\x01R\x06userIp\x12\x64\n\ruser_location\x18\x04 \x01(\x0b\x32:.ingestion.v1alpha.EventProperties.UserProperties.LocationB\x03\xe0\x41\x01R\x0cuserLocation\x12I\n\x10user_create_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x0euserCreateTime\x12/\n\x11user_display_name\x18\x06 \x01(\tB\x03\xe0\x41\x01R\x0fuserDisplayName\x1a\x66\n\x08Location\x12&\n\x0c\x63ountry_code\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x0b\x63ountryCode\x12\x19\n\x05state\x18\x02 \x01(\tB\x03\xe0\x41\x01R\x05state\x12\x17\n\x04\x63ity\x18\x03 \x01(\tB\x03\xe0\x41\x01R\x04\x63ity\x1a\xba\x02\n\x12\x46\x65\x65\x64\x62\x61\x63kProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12\x31\n\x12message_index_hint\x18\x02 \x01(\x05\x42\x03\xe0\x41\x01R\x10messageIndexHint\x12j\n\x0f\x66\x65\x65\x64\x62\x61\x63k_target\x18\x03 \x01(\x0e\x32<.ingestion.v1alpha.EventProperties.FeedbackProperties.TargetB\x03\xe0\x41\x02R\x0e\x66\x65\x65\x64\x62\x61\x63kTarget\x12\x17\n\x04type\x18\x04 \x01(\tB\x03\xe0\x41\x02R\x04type\"H\n\x06Target\x12\x16\n\x12TARGET_UNSPECIFIED\x10\x00\x12\x12\n\x0eTARGET_SESSION\x10\x01\x12\x12\n\x0eTARGET_MESSAGE\x10\x02\x1a=\n\x13\x43ustomPropertyValue\x12&\n\x0cstring_value\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x0bstringValue\x1a{\n\x15\x43ustomPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12L\n\x05value\x18\x02 \x01(\x0b\x32\x36.ingestion.v1alpha.EventProperties.CustomPropertyValueR\x05value:\x02\x38\x01\x42\x15\n\x13reserved_propertiesJ\x04\x08\x05\x10\nB\xd7\x01\n\x15\x63om.ingestion.v1alphaB\nEventProtoP\x01ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\xa2\x02\x03IXX\xaa\x02\x11Ingestion.V1alpha\xca\x02\x11Ingestion\\V1alpha\xe2\x02\x1dIngestion\\V1alpha\\GPBMetadata\xea\x02\x12Ingestion::V1alphab\x06proto3') - -_globals = globals() -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ingestion.v1alpha.event_pb2', _globals) -if not _descriptor._USE_C_DESCRIPTORS: - _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\025com.ingestion.v1alphaB\nEventProtoP\001ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\242\002\003IXX\252\002\021Ingestion.V1alpha\312\002\021Ingestion\\V1alpha\342\002\035Ingestion\\V1alpha\\GPBMetadata\352\002\022Ingestion::V1alpha' - _globals['_EVENT'].fields_by_name['id']._loaded_options = None - _globals['_EVENT'].fields_by_name['id']._serialized_options = b'\340A\002' - _globals['_EVENT'].fields_by_name['type']._loaded_options = None - _globals['_EVENT'].fields_by_name['type']._serialized_options = b'\340A\002' - _globals['_EVENT'].fields_by_name['create_time']._loaded_options = None - _globals['_EVENT'].fields_by_name['create_time']._serialized_options = b'\340A\001' - _globals['_EVENT'].fields_by_name['properties']._loaded_options = None - _globals['_EVENT'].fields_by_name['properties']._serialized_options = b'\340A\002' - _globals['_EVENT'].fields_by_name['project_id']._loaded_options = None - _globals['_EVENT'].fields_by_name['project_id']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_id']._loaded_options = None - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_id']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_title']._loaded_options = None - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_title']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_start_time']._loaded_options = None - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_start_time']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['user_id']._loaded_options = None - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['user_id']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['assistant_id']._loaded_options = None - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['assistant_id']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['session_id']._loaded_options = None - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['session_id']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_id_hint']._loaded_options = None - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_id_hint']._serialized_options = b'\030\001\340A\001' - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_index_hint']._loaded_options = None - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_index_hint']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_role']._loaded_options = None - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_role']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_content']._loaded_options = None - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_content']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_create_time']._loaded_options = None - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_create_time']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['country_code']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['country_code']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['state']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['state']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['city']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['city']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_id']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_id']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_email']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_email']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_ip']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_ip']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_location']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_location']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_create_time']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_create_time']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_display_name']._loaded_options = None - _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_display_name']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['session_id']._loaded_options = None - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['session_id']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['message_index_hint']._loaded_options = None - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['message_index_hint']._serialized_options = b'\340A\001' - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['feedback_target']._loaded_options = None - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['feedback_target']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['type']._loaded_options = None - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['type']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE'].fields_by_name['string_value']._loaded_options = None - _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE'].fields_by_name['string_value']._serialized_options = b'\340A\002' - _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._loaded_options = None - _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._serialized_options = b'8\001' - _globals['_EVENTPROPERTIES'].fields_by_name['custom_properties']._loaded_options = None - _globals['_EVENTPROPERTIES'].fields_by_name['custom_properties']._serialized_options = b'\340A\001' - _globals['_EVENT']._serialized_start=119 - _globals['_EVENT']._serialized_end=347 - _globals['_EVENTPROPERTIES']._serialized_start=350 - _globals['_EVENTPROPERTIES']._serialized_end=2556 - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES']._serialized_start=884 - _globals['_EVENTPROPERTIES_SESSIONPROPERTIES']._serialized_end=1130 - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES']._serialized_start=1133 - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES']._serialized_end=1577 - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES_ROLE']._serialized_start=1514 - _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES_ROLE']._serialized_end=1577 - _globals['_EVENTPROPERTIES_USERPROPERTIES']._serialized_start=1580 - _globals['_EVENTPROPERTIES_USERPROPERTIES']._serialized_end=2022 - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION']._serialized_start=1920 - _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION']._serialized_end=2022 - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES']._serialized_start=2025 - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES']._serialized_end=2339 - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES_TARGET']._serialized_start=2267 - _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES_TARGET']._serialized_end=2339 - _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE']._serialized_start=2341 - _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE']._serialized_end=2402 - _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._serialized_start=2404 - _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._serialized_end=2527 -# @@protoc_insertion_point(module_scope) diff --git a/alignai/ingestion/v1alpha/event_pb2.pyi b/alignai/ingestion/v1alpha/event_pb2.pyi deleted file mode 100644 index e89f723..0000000 --- a/alignai/ingestion/v1alpha/event_pb2.pyi +++ /dev/null @@ -1,128 +0,0 @@ -from google.api import field_behavior_pb2 as _field_behavior_pb2 -from google.protobuf import timestamp_pb2 as _timestamp_pb2 -from google.protobuf.internal import containers as _containers -from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union - -DESCRIPTOR: _descriptor.FileDescriptor - -class Event(_message.Message): - __slots__ = ("id", "type", "create_time", "properties", "project_id") - ID_FIELD_NUMBER: _ClassVar[int] - TYPE_FIELD_NUMBER: _ClassVar[int] - CREATE_TIME_FIELD_NUMBER: _ClassVar[int] - PROPERTIES_FIELD_NUMBER: _ClassVar[int] - PROJECT_ID_FIELD_NUMBER: _ClassVar[int] - id: str - type: str - create_time: _timestamp_pb2.Timestamp - properties: EventProperties - project_id: str - def __init__(self, id: _Optional[str] = ..., type: _Optional[str] = ..., create_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., properties: _Optional[_Union[EventProperties, _Mapping]] = ..., project_id: _Optional[str] = ...) -> None: ... - -class EventProperties(_message.Message): - __slots__ = ("session_properties", "message_properties", "user_properties", "feedback_properties", "custom_properties") - class SessionProperties(_message.Message): - __slots__ = ("session_id", "session_title", "session_start_time", "user_id", "assistant_id") - SESSION_ID_FIELD_NUMBER: _ClassVar[int] - SESSION_TITLE_FIELD_NUMBER: _ClassVar[int] - SESSION_START_TIME_FIELD_NUMBER: _ClassVar[int] - USER_ID_FIELD_NUMBER: _ClassVar[int] - ASSISTANT_ID_FIELD_NUMBER: _ClassVar[int] - session_id: str - session_title: str - session_start_time: _timestamp_pb2.Timestamp - user_id: str - assistant_id: str - def __init__(self, session_id: _Optional[str] = ..., session_title: _Optional[str] = ..., session_start_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., user_id: _Optional[str] = ..., assistant_id: _Optional[str] = ...) -> None: ... - class MessageProperties(_message.Message): - __slots__ = ("session_id", "message_id_hint", "message_index_hint", "message_role", "message_content", "message_create_time") - class Role(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): - __slots__ = () - ROLE_UNSPECIFIED: _ClassVar[EventProperties.MessageProperties.Role] - ROLE_USER: _ClassVar[EventProperties.MessageProperties.Role] - ROLE_ASSISTANT: _ClassVar[EventProperties.MessageProperties.Role] - ROLE_UNSPECIFIED: EventProperties.MessageProperties.Role - ROLE_USER: EventProperties.MessageProperties.Role - ROLE_ASSISTANT: EventProperties.MessageProperties.Role - SESSION_ID_FIELD_NUMBER: _ClassVar[int] - MESSAGE_ID_HINT_FIELD_NUMBER: _ClassVar[int] - MESSAGE_INDEX_HINT_FIELD_NUMBER: _ClassVar[int] - MESSAGE_ROLE_FIELD_NUMBER: _ClassVar[int] - MESSAGE_CONTENT_FIELD_NUMBER: _ClassVar[int] - MESSAGE_CREATE_TIME_FIELD_NUMBER: _ClassVar[int] - session_id: str - message_id_hint: str - message_index_hint: int - message_role: EventProperties.MessageProperties.Role - message_content: str - message_create_time: _timestamp_pb2.Timestamp - def __init__(self, session_id: _Optional[str] = ..., message_id_hint: _Optional[str] = ..., message_index_hint: _Optional[int] = ..., message_role: _Optional[_Union[EventProperties.MessageProperties.Role, str]] = ..., message_content: _Optional[str] = ..., message_create_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ...) -> None: ... - class UserProperties(_message.Message): - __slots__ = ("user_id", "user_email", "user_ip", "user_location", "user_create_time", "user_display_name") - class Location(_message.Message): - __slots__ = ("country_code", "state", "city") - COUNTRY_CODE_FIELD_NUMBER: _ClassVar[int] - STATE_FIELD_NUMBER: _ClassVar[int] - CITY_FIELD_NUMBER: _ClassVar[int] - country_code: str - state: str - city: str - def __init__(self, country_code: _Optional[str] = ..., state: _Optional[str] = ..., city: _Optional[str] = ...) -> None: ... - USER_ID_FIELD_NUMBER: _ClassVar[int] - USER_EMAIL_FIELD_NUMBER: _ClassVar[int] - USER_IP_FIELD_NUMBER: _ClassVar[int] - USER_LOCATION_FIELD_NUMBER: _ClassVar[int] - USER_CREATE_TIME_FIELD_NUMBER: _ClassVar[int] - USER_DISPLAY_NAME_FIELD_NUMBER: _ClassVar[int] - user_id: str - user_email: str - user_ip: str - user_location: EventProperties.UserProperties.Location - user_create_time: _timestamp_pb2.Timestamp - user_display_name: str - def __init__(self, user_id: _Optional[str] = ..., user_email: _Optional[str] = ..., user_ip: _Optional[str] = ..., user_location: _Optional[_Union[EventProperties.UserProperties.Location, _Mapping]] = ..., user_create_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., user_display_name: _Optional[str] = ...) -> None: ... - class FeedbackProperties(_message.Message): - __slots__ = ("session_id", "message_index_hint", "feedback_target", "type") - class Target(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): - __slots__ = () - TARGET_UNSPECIFIED: _ClassVar[EventProperties.FeedbackProperties.Target] - TARGET_SESSION: _ClassVar[EventProperties.FeedbackProperties.Target] - TARGET_MESSAGE: _ClassVar[EventProperties.FeedbackProperties.Target] - TARGET_UNSPECIFIED: EventProperties.FeedbackProperties.Target - TARGET_SESSION: EventProperties.FeedbackProperties.Target - TARGET_MESSAGE: EventProperties.FeedbackProperties.Target - SESSION_ID_FIELD_NUMBER: _ClassVar[int] - MESSAGE_INDEX_HINT_FIELD_NUMBER: _ClassVar[int] - FEEDBACK_TARGET_FIELD_NUMBER: _ClassVar[int] - TYPE_FIELD_NUMBER: _ClassVar[int] - session_id: str - message_index_hint: int - feedback_target: EventProperties.FeedbackProperties.Target - type: str - def __init__(self, session_id: _Optional[str] = ..., message_index_hint: _Optional[int] = ..., feedback_target: _Optional[_Union[EventProperties.FeedbackProperties.Target, str]] = ..., type: _Optional[str] = ...) -> None: ... - class CustomPropertyValue(_message.Message): - __slots__ = ("string_value",) - STRING_VALUE_FIELD_NUMBER: _ClassVar[int] - string_value: str - def __init__(self, string_value: _Optional[str] = ...) -> None: ... - class CustomPropertiesEntry(_message.Message): - __slots__ = ("key", "value") - KEY_FIELD_NUMBER: _ClassVar[int] - VALUE_FIELD_NUMBER: _ClassVar[int] - key: str - value: EventProperties.CustomPropertyValue - def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[EventProperties.CustomPropertyValue, _Mapping]] = ...) -> None: ... - SESSION_PROPERTIES_FIELD_NUMBER: _ClassVar[int] - MESSAGE_PROPERTIES_FIELD_NUMBER: _ClassVar[int] - USER_PROPERTIES_FIELD_NUMBER: _ClassVar[int] - FEEDBACK_PROPERTIES_FIELD_NUMBER: _ClassVar[int] - CUSTOM_PROPERTIES_FIELD_NUMBER: _ClassVar[int] - session_properties: EventProperties.SessionProperties - message_properties: EventProperties.MessageProperties - user_properties: EventProperties.UserProperties - feedback_properties: EventProperties.FeedbackProperties - custom_properties: _containers.MessageMap[str, EventProperties.CustomPropertyValue] - def __init__(self, session_properties: _Optional[_Union[EventProperties.SessionProperties, _Mapping]] = ..., message_properties: _Optional[_Union[EventProperties.MessageProperties, _Mapping]] = ..., user_properties: _Optional[_Union[EventProperties.UserProperties, _Mapping]] = ..., feedback_properties: _Optional[_Union[EventProperties.FeedbackProperties, _Mapping]] = ..., custom_properties: _Optional[_Mapping[str, EventProperties.CustomPropertyValue]] = ...) -> None: ... diff --git a/alignai/ingestion/v1alpha/ingestion_pb2.py b/alignai/ingestion/v1alpha/ingestion_pb2.py deleted file mode 100644 index 6962910..0000000 --- a/alignai/ingestion/v1alpha/ingestion_pb2.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE -# source: ingestion/v1alpha/ingestion.proto -# Protobuf Python Version: 5.28.1 -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -# from google.protobuf import runtime_version as _runtime_version -from google.protobuf import symbol_database as _symbol_database -from google.protobuf.internal import builder as _builder -# _runtime_version.ValidateProtobufRuntimeVersion( -# _runtime_version.Domain.PUBLIC, -# 5, -# 28, -# 1, -# '', -# 'ingestion/v1alpha/ingestion.proto' -# ) -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from google.api import field_behavior_pb2 as google_dot_api_dot_field__behavior__pb2 -from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -from alignai.ingestion.v1alpha import event_pb2 as ingestion_dot_v1alpha_dot_event__pb2 - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!ingestion/v1alpha/ingestion.proto\x12\x11ingestion.v1alpha\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1dingestion/v1alpha/event.proto\"q\n\x14\x43ollectEventsRequest\x12\"\n\nrequest_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\trequestId\x12\x35\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x18.ingestion.v1alpha.EventB\x03\xe0\x41\x02R\x06\x65vents2f\n\x10IngestionService\x12R\n\rCollectEvents\x12\'.ingestion.v1alpha.CollectEventsRequest\x1a\x16.google.protobuf.Empty\"\x00\x42\xdb\x01\n\x15\x63om.ingestion.v1alphaB\x0eIngestionProtoP\x01ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\xa2\x02\x03IXX\xaa\x02\x11Ingestion.V1alpha\xca\x02\x11Ingestion\\V1alpha\xe2\x02\x1dIngestion\\V1alpha\\GPBMetadata\xea\x02\x12Ingestion::V1alphab\x06proto3') - -_globals = globals() -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ingestion.v1alpha.ingestion_pb2', _globals) -if not _descriptor._USE_C_DESCRIPTORS: - _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\025com.ingestion.v1alphaB\016IngestionProtoP\001ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\242\002\003IXX\252\002\021Ingestion.V1alpha\312\002\021Ingestion\\V1alpha\342\002\035Ingestion\\V1alpha\\GPBMetadata\352\002\022Ingestion::V1alpha' - _globals['_COLLECTEVENTSREQUEST'].fields_by_name['request_id']._loaded_options = None - _globals['_COLLECTEVENTSREQUEST'].fields_by_name['request_id']._serialized_options = b'\340A\002' - _globals['_COLLECTEVENTSREQUEST'].fields_by_name['events']._loaded_options = None - _globals['_COLLECTEVENTSREQUEST'].fields_by_name['events']._serialized_options = b'\340A\002' - _globals['_COLLECTEVENTSREQUEST']._serialized_start=149 - _globals['_COLLECTEVENTSREQUEST']._serialized_end=262 - _globals['_INGESTIONSERVICE']._serialized_start=264 - _globals['_INGESTIONSERVICE']._serialized_end=366 -# @@protoc_insertion_point(module_scope) diff --git a/alignai/ingestion/v1alpha/ingestion_pb2.pyi b/alignai/ingestion/v1alpha/ingestion_pb2.pyi deleted file mode 100644 index 60a6d8e..0000000 --- a/alignai/ingestion/v1alpha/ingestion_pb2.pyi +++ /dev/null @@ -1,17 +0,0 @@ -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 - -DESCRIPTOR: _descriptor.FileDescriptor - -class CollectEventsRequest(_message.Message): - __slots__ = ("request_id", "events") - REQUEST_ID_FIELD_NUMBER: _ClassVar[int] - EVENTS_FIELD_NUMBER: _ClassVar[int] - request_id: str - events: _containers.RepeatedCompositeFieldContainer[_event_pb2.Event] - def __init__(self, request_id: _Optional[str] = ..., events: _Optional[_Iterable[_Union[_event_pb2.Event, _Mapping]]] = ...) -> None: ... diff --git a/alignai/utils.py b/alignai/utils.py index da55069..7f5f4dc 100644 --- a/alignai/utils.py +++ b/alignai/utils.py @@ -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 ingestion.v1alpha.event_pb2 import EventProperties def datetime_to_timestamp(dt: datetime) -> Timestamp: @@ -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( diff --git a/alignai/validate.py b/alignai/validate.py index 0ff3993..273c9f0 100644 --- a/alignai/validate.py +++ b/alignai/validate.py @@ -1,3 +1,6 @@ +from typing import Dict + + class ValidationError(ValueError): def __init__(self, message: str): self.message = message @@ -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(): diff --git a/poetry.lock b/poetry.lock index 91470f3..954d13d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -205,32 +205,32 @@ files = [ [[package]] name = "filelock" -version = "3.16.0" +version = "3.16.1" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.16.0-py3-none-any.whl", hash = "sha256:f6ed4c963184f4c84dd5557ce8fece759a3724b37b80c6c4f20a2f63a4dc6609"}, - {file = "filelock-3.16.0.tar.gz", hash = "sha256:81de9eb8453c769b63369f87f11131a7ab04e367f8d97ad39dc230daa07e3bec"}, + {file = "filelock-3.16.1-py3-none-any.whl", hash = "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0"}, + {file = "filelock-3.16.1.tar.gz", hash = "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435"}, ] [package.extras] -docs = ["furo (>=2024.8.6)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "diff-cover (>=9.1.1)", "pytest (>=8.3.2)", "pytest-asyncio (>=0.24)", "pytest-cov (>=5)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv (>=20.26.3)"] +docs = ["furo (>=2024.8.6)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4.1)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "diff-cover (>=9.2)", "pytest (>=8.3.3)", "pytest-asyncio (>=0.24)", "pytest-cov (>=5)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv (>=20.26.4)"] typing = ["typing-extensions (>=4.12.2)"] [[package]] name = "googleapis-googleapis-protocolbuffers-pyi" -version = "28.1.0.1.20240827201746+e7f8d366f526" +version = "28.2.0.1.20240827201746+e7f8d366f526" description = "This package contains generated code for the protobuf module googleapis/googleapis when generated with the plugin protocolbuffers/pyi." optional = false python-versions = ">=3.8" files = [ - {file = "googleapis_googleapis_protocolbuffers_pyi-28.1.0.1.20240827201746+e7f8d366f526-py3-none-any.whl", hash = "sha256:fcc2148628b85495a848ddef4c61a4b31797245c3f6b75ecb550b14ee3255a6a"}, + {file = "googleapis_googleapis_protocolbuffers_pyi-28.2.0.1.20240827201746+e7f8d366f526-py3-none-any.whl", hash = "sha256:5b8b9d250e6acf3d17c87b7a83fa3d35deba22c83c8f8fa88360aab2efba2906"}, ] [package.dependencies] -protobuf = ">=5.28.1,<5.29.0" +protobuf = ">=5.28.2,<5.29.0" types-protobuf = ">=5.27,<6.0" [package.source] @@ -240,17 +240,17 @@ reference = "buf" [[package]] name = "googleapis-googleapis-protocolbuffers-python" -version = "28.1.0.1.20240827201746+e7f8d366f526" +version = "28.2.0.1.20240827201746+e7f8d366f526" description = "This package contains generated code for the protobuf module googleapis/googleapis when generated with the plugin protocolbuffers/python." optional = false python-versions = ">=3.8" files = [ - {file = "googleapis_googleapis_protocolbuffers_python-28.1.0.1.20240827201746+e7f8d366f526-py3-none-any.whl", hash = "sha256:3786975cc9d364dad7115878098f94c4bc363ce777c34b8c109944d79c6ea1d4"}, + {file = "googleapis_googleapis_protocolbuffers_python-28.2.0.1.20240827201746+e7f8d366f526-py3-none-any.whl", hash = "sha256:f3a86c286643100af5a4982ebff15f52fe0eba636d56f8548429f29b3db0de58"}, ] [package.dependencies] -googleapis-googleapis-protocolbuffers-pyi = ">=28.1.0.1.20240827201746" -protobuf = ">=5.28.1,<5.29.0" +googleapis-googleapis-protocolbuffers-pyi = ">=28.2.0.1.20240827201746" +protobuf = ">=5.28.2,<5.29.0" [package.source] type = "legacy" @@ -273,18 +273,58 @@ license = ["ukkonen"] [[package]] name = "idna" -version = "3.9" +version = "3.10" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.6" files = [ - {file = "idna-3.9-py3-none-any.whl", hash = "sha256:69297d5da0cc9281c77efffb4e730254dd45943f45bbfb461de5991713989b1e"}, - {file = "idna-3.9.tar.gz", hash = "sha256:e5c5dafde284f26e9e0f28f6ea2d6400abd5ca099864a67f576f3981c6476124"}, + {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"}, + {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"}, ] [package.extras] all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"] +[[package]] +name = "impaction-ai-ingestion-protocolbuffers-pyi" +version = "28.2.0.1.20240908234409+342910308823" +description = "This package contains generated code for the protobuf module impaction-ai/ingestion when generated with the plugin protocolbuffers/pyi." +optional = false +python-versions = ">=3.8" +files = [ + {file = "impaction_ai_ingestion_protocolbuffers_pyi-28.2.0.1.20240908234409+342910308823-py3-none-any.whl", hash = "sha256:f23d93d51c5ccb6b9e43a45848747f5e2e1a5804a49e289a729129da4893c9b6"}, +] + +[package.dependencies] +googleapis-googleapis-protocolbuffers-pyi = ">=28.2.0.1.20240729201550" +protobuf = ">=5.28.2,<5.29.0" +types-protobuf = ">=5.27,<6.0" + +[package.source] +type = "legacy" +url = "https://buf.build/gen/python" +reference = "buf" + +[[package]] +name = "impaction-ai-ingestion-protocolbuffers-python" +version = "28.2.0.1.20240908234409+342910308823" +description = "This package contains generated code for the protobuf module impaction-ai/ingestion when generated with the plugin protocolbuffers/python." +optional = false +python-versions = ">=3.8" +files = [ + {file = "impaction_ai_ingestion_protocolbuffers_python-28.2.0.1.20240908234409+342910308823-py3-none-any.whl", hash = "sha256:c2650f45a9145e2a4d0cf719b48e763be577efe7e07aa8bf7de2e99e799be79d"}, +] + +[package.dependencies] +googleapis-googleapis-protocolbuffers-python = ">=28.2.0.1.20240729201550" +impaction-ai-ingestion-protocolbuffers-pyi = ">=28.2.0.1.20240908234409" +protobuf = ">=5.28.2,<5.29.0" + +[package.source] +type = "legacy" +url = "https://buf.build/gen/python" +reference = "buf" + [[package]] name = "isort" version = "5.13.2" @@ -392,13 +432,13 @@ files = [ [[package]] name = "platformdirs" -version = "4.3.3" +version = "4.3.6" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.3.3-py3-none-any.whl", hash = "sha256:50a5450e2e84f44539718293cbb1da0a0885c9d14adf21b77bae4e66fc99d9b5"}, - {file = "platformdirs-4.3.3.tar.gz", hash = "sha256:d4e0b7d8ec176b341fb03cb11ca12d0276faa8c485f9cd218f613840463fc2c0"}, + {file = "platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"}, + {file = "platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"}, ] [package.extras] @@ -426,22 +466,22 @@ virtualenv = ">=20.10.0" [[package]] name = "protobuf" -version = "5.28.1" +version = "5.28.2" description = "" optional = false python-versions = ">=3.8" files = [ - {file = "protobuf-5.28.1-cp310-abi3-win32.whl", hash = "sha256:fc063acaf7a3d9ca13146fefb5b42ac94ab943ec6e978f543cd5637da2d57957"}, - {file = "protobuf-5.28.1-cp310-abi3-win_amd64.whl", hash = "sha256:4c7f5cb38c640919791c9f74ea80c5b82314c69a8409ea36f2599617d03989af"}, - {file = "protobuf-5.28.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:4304e4fceb823d91699e924a1fdf95cde0e066f3b1c28edb665bda762ecde10f"}, - {file = "protobuf-5.28.1-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:0dfd86d2b5edf03d91ec2a7c15b4e950258150f14f9af5f51c17fa224ee1931f"}, - {file = "protobuf-5.28.1-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:51f09caab818707ab91cf09cc5c156026599cf05a4520779ccbf53c1b352fb25"}, - {file = "protobuf-5.28.1-cp38-cp38-win32.whl", hash = "sha256:1b04bde117a10ff9d906841a89ec326686c48ececeb65690f15b8cabe7149495"}, - {file = "protobuf-5.28.1-cp38-cp38-win_amd64.whl", hash = "sha256:cabfe43044ee319ad6832b2fda332646f9ef1636b0130186a3ae0a52fc264bb4"}, - {file = "protobuf-5.28.1-cp39-cp39-win32.whl", hash = "sha256:4b4b9a0562a35773ff47a3df823177ab71a1f5eb1ff56d8f842b7432ecfd7fd2"}, - {file = "protobuf-5.28.1-cp39-cp39-win_amd64.whl", hash = "sha256:f24e5d70e6af8ee9672ff605d5503491635f63d5db2fffb6472be78ba62efd8f"}, - {file = "protobuf-5.28.1-py3-none-any.whl", hash = "sha256:c529535e5c0effcf417682563719e5d8ac8d2b93de07a56108b4c2d436d7a29a"}, - {file = "protobuf-5.28.1.tar.gz", hash = "sha256:42597e938f83bb7f3e4b35f03aa45208d49ae8d5bcb4bc10b9fc825e0ab5e423"}, + {file = "protobuf-5.28.2-cp310-abi3-win32.whl", hash = "sha256:eeea10f3dc0ac7e6b4933d32db20662902b4ab81bf28df12218aa389e9c2102d"}, + {file = "protobuf-5.28.2-cp310-abi3-win_amd64.whl", hash = "sha256:2c69461a7fcc8e24be697624c09a839976d82ae75062b11a0972e41fd2cd9132"}, + {file = "protobuf-5.28.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:a8b9403fc70764b08d2f593ce44f1d2920c5077bf7d311fefec999f8c40f78b7"}, + {file = "protobuf-5.28.2-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:35cfcb15f213449af7ff6198d6eb5f739c37d7e4f1c09b5d0641babf2cc0c68f"}, + {file = "protobuf-5.28.2-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:5e8a95246d581eef20471b5d5ba010d55f66740942b95ba9b872d918c459452f"}, + {file = "protobuf-5.28.2-cp38-cp38-win32.whl", hash = "sha256:87317e9bcda04a32f2ee82089a204d3a2f0d3c8aeed16568c7daf4756e4f1fe0"}, + {file = "protobuf-5.28.2-cp38-cp38-win_amd64.whl", hash = "sha256:c0ea0123dac3399a2eeb1a1443d82b7afc9ff40241433296769f7da42d142ec3"}, + {file = "protobuf-5.28.2-cp39-cp39-win32.whl", hash = "sha256:ca53faf29896c526863366a52a8f4d88e69cd04ec9571ed6082fa117fac3ab36"}, + {file = "protobuf-5.28.2-cp39-cp39-win_amd64.whl", hash = "sha256:8ddc60bf374785fb7cb12510b267f59067fa10087325b8e1855b898a0d81d276"}, + {file = "protobuf-5.28.2-py3-none-any.whl", hash = "sha256:52235802093bd8a2811abbe8bf0ab9c5f54cca0a751fdd3f6ac2a21438bffece"}, + {file = "protobuf-5.28.2.tar.gz", hash = "sha256:59379674ff119717404f7454647913787034f03fe7049cbef1d74a97bb4593f0"}, ] [[package]] @@ -555,24 +595,24 @@ files = [ [[package]] name = "tomli" -version = "2.0.1" +version = "2.0.2" description = "A lil' TOML parser" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, + {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"}, + {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"}, ] [[package]] name = "types-protobuf" -version = "5.27.0.20240907" +version = "5.28.0.20240924" description = "Typing stubs for protobuf" optional = false python-versions = ">=3.8" files = [ - {file = "types-protobuf-5.27.0.20240907.tar.gz", hash = "sha256:bb6f90f66b18d4d1c75667b6586334b0573a6fcee5eb0142a7348a765a7cbadc"}, - {file = "types_protobuf-5.27.0.20240907-py3-none-any.whl", hash = "sha256:5443270534cc8072909ef7ad9e1421ccff924ca658749a6396c0c43d64c32676"}, + {file = "types-protobuf-5.28.0.20240924.tar.gz", hash = "sha256:d181af8a256e5a91ce8d5adb53496e880efd9144c7d54483e3653332b60296f0"}, + {file = "types_protobuf-5.28.0.20240924-py3-none-any.whl", hash = "sha256:5cecf612ccdefb7dc95f7a51fb502902f20fc2e6681cd500184aaa1b3931d6a7"}, ] [[package]] @@ -605,13 +645,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "virtualenv" -version = "20.26.4" +version = "20.26.6" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.26.4-py3-none-any.whl", hash = "sha256:48f2695d9809277003f30776d155615ffc11328e6a0a8c1f0ec80188d7874a55"}, - {file = "virtualenv-20.26.4.tar.gz", hash = "sha256:c17f4e0f3e6036e9f26700446f85c76ab11df65ff6d8a9cbfad9f71aabfcf23c"}, + {file = "virtualenv-20.26.6-py3-none-any.whl", hash = "sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2"}, + {file = "virtualenv-20.26.6.tar.gz", hash = "sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48"}, ] [package.dependencies] @@ -626,4 +666,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = ">=3.8.0,<4.0" -content-hash = "0b2171e83f6714faf0afdca66f5d58dc2bc3b95ba5fee6d14c777add637c512f" +content-hash = "fc427ce6cf6a8010bb54aa94b8f56561ad46094adf526304ff6692e6352c359e" diff --git a/pyproject.toml b/pyproject.toml index c4f76e1..f4b85ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,9 +10,11 @@ packages = [{include = "alignai"}] [tool.poetry.dependencies] python = ">=3.8.0,<4.0" requests = "^2.31.0" -protobuf = "^5.28.1" -googleapis-googleapis-protocolbuffers-python = "^28.1.0.1.20240827201746+e7f8d366f526" -googleapis-googleapis-protocolbuffers-pyi = "^28.1.0.1.20240827201746+e7f8d366f526" +protobuf = "^5.28.2" +googleapis-googleapis-protocolbuffers-python = "^28.2.0.1.20240827201746+e7f8d366f526" +googleapis-googleapis-protocolbuffers-pyi = "^28.2.0.1.20240827201746+e7f8d366f526" +impaction-ai-ingestion-protocolbuffers-pyi = "28.2.0.1.20240908234409+342910308823" +impaction-ai-ingestion-protocolbuffers-python = "28.2.0.1.20240908234409+342910308823" [tool.poetry.group.dev.dependencies] ruff = "^0.3.7" From 7e6299e3d703674b5f674a9a59aa09019797c7db Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Tue, 8 Oct 2024 08:50:43 +0000 Subject: [PATCH 4/9] remove pendulum usage --- alignai/client.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/alignai/client.py b/alignai/client.py index 8c137fd..421b391 100644 --- a/alignai/client.py +++ b/alignai/client.py @@ -2,9 +2,8 @@ import os import uuid -from datetime import datetime +from datetime import datetime, timezone -import pendulum from ingestion.v1alpha.event_pb2 import Event, EventProperties from alignai.api_client import APIClient @@ -100,7 +99,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, @@ -120,7 +119,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, ) @@ -172,7 +171,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, @@ -211,7 +210,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, @@ -249,7 +248,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, @@ -285,7 +284,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, From 62a7361a74826d2a1e6d2500423ea1dc103435f1 Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Thu, 10 Oct 2024 04:53:25 +0000 Subject: [PATCH 5/9] update lock --- poetry.lock | 203 ++++++++++++++++++++++++++++------------------------ 1 file changed, 109 insertions(+), 94 deletions(-) diff --git a/poetry.lock b/poetry.lock index 954d13d..a3f56d6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -70,101 +70,116 @@ files = [ [[package]] name = "charset-normalizer" -version = "3.3.2" +version = "3.4.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." optional = false python-versions = ">=3.7.0" files = [ - {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"}, - {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"}, - {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"}, - {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"}, - {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"}, - {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"}, - {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"}, - {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-win32.whl", hash = "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc"}, + {file = "charset_normalizer-3.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-win32.whl", hash = "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99"}, + {file = "charset_normalizer-3.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-win32.whl", hash = "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7"}, + {file = "charset_normalizer-3.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-win32.whl", hash = "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67"}, + {file = "charset_normalizer-3.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_s390x.whl", hash = "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-win32.whl", hash = "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149"}, + {file = "charset_normalizer-3.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-win32.whl", hash = "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613"}, + {file = "charset_normalizer-3.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-win32.whl", hash = "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2"}, + {file = "charset_normalizer-3.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca"}, + {file = "charset_normalizer-3.4.0-py3-none-any.whl", hash = "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079"}, + {file = "charset_normalizer-3.4.0.tar.gz", hash = "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e"}, ] [[package]] @@ -194,13 +209,13 @@ files = [ [[package]] name = "distlib" -version = "0.3.8" +version = "0.3.9" description = "Distribution utilities" optional = false python-versions = "*" files = [ - {file = "distlib-0.3.8-py2.py3-none-any.whl", hash = "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784"}, - {file = "distlib-0.3.8.tar.gz", hash = "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"}, + {file = "distlib-0.3.9-py2.py3-none-any.whl", hash = "sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87"}, + {file = "distlib-0.3.9.tar.gz", hash = "sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403"}, ] [[package]] From 11612f62e0b327f6620f5551485d423393fc11ca Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Sat, 12 Oct 2024 07:18:57 +0000 Subject: [PATCH 6/9] re-embed proto stubs --- alignai/api_client.py | 4 +- alignai/buffer_storage.py | 2 +- alignai/proto/__init__.py | 0 alignai/proto/ingestion/v1alpha/__init__.py | 0 alignai/proto/ingestion/v1alpha/event_pb2.py | 119 +++++++++++++ alignai/proto/ingestion/v1alpha/event_pb2.pyi | 127 ++++++++++++++ .../proto/ingestion/v1alpha/ingestion_pb2.py | 41 +++++ .../proto/ingestion/v1alpha/ingestion_pb2.pyi | 17 ++ alignai/utils.py | 2 +- poetry.lock | 163 +++++++++++------- pyproject.toml | 16 +- 11 files changed, 412 insertions(+), 79 deletions(-) create mode 100644 alignai/proto/__init__.py create mode 100644 alignai/proto/ingestion/v1alpha/__init__.py create mode 100644 alignai/proto/ingestion/v1alpha/event_pb2.py create mode 100644 alignai/proto/ingestion/v1alpha/event_pb2.pyi create mode 100644 alignai/proto/ingestion/v1alpha/ingestion_pb2.py create mode 100644 alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi diff --git a/alignai/api_client.py b/alignai/api_client.py index b5291e7..2b812fd 100644 --- a/alignai/api_client.py +++ b/alignai/api_client.py @@ -5,11 +5,11 @@ from urllib.parse import urljoin import requests -from ingestion.v1alpha.event_pb2 import Event -from ingestion.v1alpha.ingestion_pb2 import CollectEventsRequest from requests.exceptions import RequestException from alignai.exception import APIError +from alignai.proto.ingestion.v1alpha.event_pb2 import Event +from alignai.proto.ingestion.v1alpha.ingestion_pb2 import CollectEventsRequest class APIClient: diff --git a/alignai/buffer_storage.py b/alignai/buffer_storage.py index 62943ea..224937a 100644 --- a/alignai/buffer_storage.py +++ b/alignai/buffer_storage.py @@ -2,7 +2,7 @@ from threading import Condition, Lock -from ingestion.v1alpha.event_pb2 import Event +from alignai.proto.ingestion.v1alpha.event_pb2 import Event class BufferStorage: diff --git a/alignai/proto/__init__.py b/alignai/proto/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/alignai/proto/ingestion/v1alpha/__init__.py b/alignai/proto/ingestion/v1alpha/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/alignai/proto/ingestion/v1alpha/event_pb2.py b/alignai/proto/ingestion/v1alpha/event_pb2.py new file mode 100644 index 0000000..361c19e --- /dev/null +++ b/alignai/proto/ingestion/v1alpha/event_pb2.py @@ -0,0 +1,119 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE +# source: ingestion/v1alpha/event.proto +# Protobuf Python Version: 5.28.1 +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version +from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 28, + 1, + '', + 'ingestion/v1alpha/event.proto' +) +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dingestion/v1alpha/event.proto\x12\x11ingestion.v1alpha\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xe4\x01\n\x05\x45vent\x12\x13\n\x02id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x02id\x12\x17\n\x04type\x18\x02 \x01(\tB\x03\xe0\x41\x02R\x04type\x12@\n\x0b\x63reate_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\ncreateTime\x12G\n\nproperties\x18\x04 \x01(\x0b\x32\".ingestion.v1alpha.EventPropertiesB\x03\xe0\x41\x02R\nproperties\x12\"\n\nproject_id\x18\x05 \x01(\tB\x03\xe0\x41\x02R\tprojectId\"\x9e\x11\n\x0f\x45ventProperties\x12\x65\n\x12session_properties\x18\x01 \x01(\x0b\x32\x34.ingestion.v1alpha.EventProperties.SessionPropertiesH\x00R\x11sessionProperties\x12\x65\n\x12message_properties\x18\x02 \x01(\x0b\x32\x34.ingestion.v1alpha.EventProperties.MessagePropertiesH\x00R\x11messageProperties\x12\\\n\x0fuser_properties\x18\x03 \x01(\x0b\x32\x31.ingestion.v1alpha.EventProperties.UserPropertiesH\x00R\x0euserProperties\x12h\n\x13\x66\x65\x65\x64\x62\x61\x63k_properties\x18\x04 \x01(\x0b\x32\x35.ingestion.v1alpha.EventProperties.FeedbackPropertiesH\x00R\x12\x66\x65\x65\x64\x62\x61\x63kProperties\x12j\n\x11\x63ustom_properties\x18\n \x03(\x0b\x32\x38.ingestion.v1alpha.EventProperties.CustomPropertiesEntryB\x03\xe0\x41\x01R\x10\x63ustomProperties\x1a\xf6\x01\n\x11SessionProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12(\n\rsession_title\x18\x02 \x01(\tB\x03\xe0\x41\x01R\x0csessionTitle\x12M\n\x12session_start_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x10sessionStartTime\x12\x1c\n\x07user_id\x18\x04 \x01(\tB\x03\xe0\x41\x02R\x06userId\x12&\n\x0c\x61ssistant_id\x18\x05 \x01(\tB\x03\xe0\x41\x01R\x0b\x61ssistantId\x1a\xbc\x03\n\x11MessageProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12-\n\x0fmessage_id_hint\x18\x02 \x01(\tB\x05\x18\x01\xe0\x41\x01R\rmessageIdHint\x12\x31\n\x12message_index_hint\x18\x03 \x01(\x05\x42\x03\xe0\x41\x02R\x10messageIndexHint\x12\x61\n\x0cmessage_role\x18\x04 \x01(\x0e\x32\x39.ingestion.v1alpha.EventProperties.MessageProperties.RoleB\x03\xe0\x41\x02R\x0bmessageRole\x12,\n\x0fmessage_content\x18\x05 \x01(\tB\x03\xe0\x41\x02R\x0emessageContent\x12O\n\x13message_create_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x11messageCreateTime\"?\n\x04Role\x12\x14\n\x10ROLE_UNSPECIFIED\x10\x00\x12\r\n\tROLE_USER\x10\x01\x12\x12\n\x0eROLE_ASSISTANT\x10\x02\x1a\xba\x03\n\x0eUserProperties\x12\x1c\n\x07user_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x06userId\x12\"\n\nuser_email\x18\x02 \x01(\tB\x03\xe0\x41\x01R\tuserEmail\x12\x1c\n\x07user_ip\x18\x03 \x01(\tB\x03\xe0\x41\x01R\x06userIp\x12\x64\n\ruser_location\x18\x04 \x01(\x0b\x32:.ingestion.v1alpha.EventProperties.UserProperties.LocationB\x03\xe0\x41\x01R\x0cuserLocation\x12I\n\x10user_create_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x0euserCreateTime\x12/\n\x11user_display_name\x18\x06 \x01(\tB\x03\xe0\x41\x01R\x0fuserDisplayName\x1a\x66\n\x08Location\x12&\n\x0c\x63ountry_code\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x0b\x63ountryCode\x12\x19\n\x05state\x18\x02 \x01(\tB\x03\xe0\x41\x01R\x05state\x12\x17\n\x04\x63ity\x18\x03 \x01(\tB\x03\xe0\x41\x01R\x04\x63ity\x1a\xba\x02\n\x12\x46\x65\x65\x64\x62\x61\x63kProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12\x31\n\x12message_index_hint\x18\x02 \x01(\x05\x42\x03\xe0\x41\x01R\x10messageIndexHint\x12j\n\x0f\x66\x65\x65\x64\x62\x61\x63k_target\x18\x03 \x01(\x0e\x32<.ingestion.v1alpha.EventProperties.FeedbackProperties.TargetB\x03\xe0\x41\x02R\x0e\x66\x65\x65\x64\x62\x61\x63kTarget\x12\x17\n\x04type\x18\x04 \x01(\tB\x03\xe0\x41\x02R\x04type\"H\n\x06Target\x12\x16\n\x12TARGET_UNSPECIFIED\x10\x00\x12\x12\n\x0eTARGET_SESSION\x10\x01\x12\x12\n\x0eTARGET_MESSAGE\x10\x02\x1a=\n\x13\x43ustomPropertyValue\x12&\n\x0cstring_value\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x0bstringValue\x1a{\n\x15\x43ustomPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12L\n\x05value\x18\x02 \x01(\x0b\x32\x36.ingestion.v1alpha.EventProperties.CustomPropertyValueR\x05value:\x02\x38\x01\x42\x15\n\x13reserved_propertiesJ\x04\x08\x05\x10\nB\xd7\x01\n\x15\x63om.ingestion.v1alphaB\nEventProtoP\x01ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\xa2\x02\x03IXX\xaa\x02\x11Ingestion.V1alpha\xca\x02\x11Ingestion\\V1alpha\xe2\x02\x1dIngestion\\V1alpha\\GPBMetadata\xea\x02\x12Ingestion::V1alphab\x06proto3') + +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ingestion.v1alpha.event_pb2', _globals) +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None + _globals['DESCRIPTOR']._serialized_options = b'\n\025com.ingestion.v1alphaB\nEventProtoP\001ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\242\002\003IXX\252\002\021Ingestion.V1alpha\312\002\021Ingestion\\V1alpha\342\002\035Ingestion\\V1alpha\\GPBMetadata\352\002\022Ingestion::V1alpha' + _globals['_EVENT'].fields_by_name['id']._loaded_options = None + _globals['_EVENT'].fields_by_name['id']._serialized_options = b'\340A\002' + _globals['_EVENT'].fields_by_name['type']._loaded_options = None + _globals['_EVENT'].fields_by_name['type']._serialized_options = b'\340A\002' + _globals['_EVENT'].fields_by_name['create_time']._loaded_options = None + _globals['_EVENT'].fields_by_name['create_time']._serialized_options = b'\340A\001' + _globals['_EVENT'].fields_by_name['properties']._loaded_options = None + _globals['_EVENT'].fields_by_name['properties']._serialized_options = b'\340A\002' + _globals['_EVENT'].fields_by_name['project_id']._loaded_options = None + _globals['_EVENT'].fields_by_name['project_id']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_id']._loaded_options = None + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_id']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_title']._loaded_options = None + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_title']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_start_time']._loaded_options = None + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['session_start_time']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['user_id']._loaded_options = None + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['user_id']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['assistant_id']._loaded_options = None + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES'].fields_by_name['assistant_id']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['session_id']._loaded_options = None + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['session_id']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_id_hint']._loaded_options = None + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_id_hint']._serialized_options = b'\030\001\340A\001' + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_index_hint']._loaded_options = None + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_index_hint']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_role']._loaded_options = None + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_role']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_content']._loaded_options = None + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_content']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_create_time']._loaded_options = None + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES'].fields_by_name['message_create_time']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['country_code']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['country_code']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['state']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['state']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['city']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION'].fields_by_name['city']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_id']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_id']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_email']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_email']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_ip']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_ip']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_location']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_location']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_create_time']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_create_time']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_display_name']._loaded_options = None + _globals['_EVENTPROPERTIES_USERPROPERTIES'].fields_by_name['user_display_name']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['session_id']._loaded_options = None + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['session_id']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['message_index_hint']._loaded_options = None + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['message_index_hint']._serialized_options = b'\340A\001' + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['feedback_target']._loaded_options = None + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['feedback_target']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['type']._loaded_options = None + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES'].fields_by_name['type']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE'].fields_by_name['string_value']._loaded_options = None + _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE'].fields_by_name['string_value']._serialized_options = b'\340A\002' + _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._loaded_options = None + _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._serialized_options = b'8\001' + _globals['_EVENTPROPERTIES'].fields_by_name['custom_properties']._loaded_options = None + _globals['_EVENTPROPERTIES'].fields_by_name['custom_properties']._serialized_options = b'\340A\001' + _globals['_EVENT']._serialized_start=119 + _globals['_EVENT']._serialized_end=347 + _globals['_EVENTPROPERTIES']._serialized_start=350 + _globals['_EVENTPROPERTIES']._serialized_end=2556 + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES']._serialized_start=884 + _globals['_EVENTPROPERTIES_SESSIONPROPERTIES']._serialized_end=1130 + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES']._serialized_start=1133 + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES']._serialized_end=1577 + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES_ROLE']._serialized_start=1514 + _globals['_EVENTPROPERTIES_MESSAGEPROPERTIES_ROLE']._serialized_end=1577 + _globals['_EVENTPROPERTIES_USERPROPERTIES']._serialized_start=1580 + _globals['_EVENTPROPERTIES_USERPROPERTIES']._serialized_end=2022 + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION']._serialized_start=1920 + _globals['_EVENTPROPERTIES_USERPROPERTIES_LOCATION']._serialized_end=2022 + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES']._serialized_start=2025 + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES']._serialized_end=2339 + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES_TARGET']._serialized_start=2267 + _globals['_EVENTPROPERTIES_FEEDBACKPROPERTIES_TARGET']._serialized_end=2339 + _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE']._serialized_start=2341 + _globals['_EVENTPROPERTIES_CUSTOMPROPERTYVALUE']._serialized_end=2402 + _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._serialized_start=2404 + _globals['_EVENTPROPERTIES_CUSTOMPROPERTIESENTRY']._serialized_end=2527 +# @@protoc_insertion_point(module_scope) diff --git a/alignai/proto/ingestion/v1alpha/event_pb2.pyi b/alignai/proto/ingestion/v1alpha/event_pb2.pyi new file mode 100644 index 0000000..c59aaa7 --- /dev/null +++ b/alignai/proto/ingestion/v1alpha/event_pb2.pyi @@ -0,0 +1,127 @@ +from google.protobuf import timestamp_pb2 as _timestamp_pb2 +from google.protobuf.internal import containers as _containers +from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union + +DESCRIPTOR: _descriptor.FileDescriptor + +class Event(_message.Message): + __slots__ = ("id", "type", "create_time", "properties", "project_id") + ID_FIELD_NUMBER: _ClassVar[int] + TYPE_FIELD_NUMBER: _ClassVar[int] + CREATE_TIME_FIELD_NUMBER: _ClassVar[int] + PROPERTIES_FIELD_NUMBER: _ClassVar[int] + PROJECT_ID_FIELD_NUMBER: _ClassVar[int] + id: str + type: str + create_time: _timestamp_pb2.Timestamp + properties: EventProperties + project_id: str + def __init__(self, id: _Optional[str] = ..., type: _Optional[str] = ..., create_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., properties: _Optional[_Union[EventProperties, _Mapping]] = ..., project_id: _Optional[str] = ...) -> None: ... + +class EventProperties(_message.Message): + __slots__ = ("session_properties", "message_properties", "user_properties", "feedback_properties", "custom_properties") + class SessionProperties(_message.Message): + __slots__ = ("session_id", "session_title", "session_start_time", "user_id", "assistant_id") + SESSION_ID_FIELD_NUMBER: _ClassVar[int] + SESSION_TITLE_FIELD_NUMBER: _ClassVar[int] + SESSION_START_TIME_FIELD_NUMBER: _ClassVar[int] + USER_ID_FIELD_NUMBER: _ClassVar[int] + ASSISTANT_ID_FIELD_NUMBER: _ClassVar[int] + session_id: str + session_title: str + session_start_time: _timestamp_pb2.Timestamp + user_id: str + assistant_id: str + def __init__(self, session_id: _Optional[str] = ..., session_title: _Optional[str] = ..., session_start_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., user_id: _Optional[str] = ..., assistant_id: _Optional[str] = ...) -> None: ... + class MessageProperties(_message.Message): + __slots__ = ("session_id", "message_id_hint", "message_index_hint", "message_role", "message_content", "message_create_time") + class Role(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = () + ROLE_UNSPECIFIED: _ClassVar[EventProperties.MessageProperties.Role] + ROLE_USER: _ClassVar[EventProperties.MessageProperties.Role] + ROLE_ASSISTANT: _ClassVar[EventProperties.MessageProperties.Role] + ROLE_UNSPECIFIED: EventProperties.MessageProperties.Role + ROLE_USER: EventProperties.MessageProperties.Role + ROLE_ASSISTANT: EventProperties.MessageProperties.Role + SESSION_ID_FIELD_NUMBER: _ClassVar[int] + MESSAGE_ID_HINT_FIELD_NUMBER: _ClassVar[int] + MESSAGE_INDEX_HINT_FIELD_NUMBER: _ClassVar[int] + MESSAGE_ROLE_FIELD_NUMBER: _ClassVar[int] + MESSAGE_CONTENT_FIELD_NUMBER: _ClassVar[int] + MESSAGE_CREATE_TIME_FIELD_NUMBER: _ClassVar[int] + session_id: str + message_id_hint: str + message_index_hint: int + message_role: EventProperties.MessageProperties.Role + message_content: str + message_create_time: _timestamp_pb2.Timestamp + def __init__(self, session_id: _Optional[str] = ..., message_id_hint: _Optional[str] = ..., message_index_hint: _Optional[int] = ..., message_role: _Optional[_Union[EventProperties.MessageProperties.Role, str]] = ..., message_content: _Optional[str] = ..., message_create_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ...) -> None: ... + class UserProperties(_message.Message): + __slots__ = ("user_id", "user_email", "user_ip", "user_location", "user_create_time", "user_display_name") + class Location(_message.Message): + __slots__ = ("country_code", "state", "city") + COUNTRY_CODE_FIELD_NUMBER: _ClassVar[int] + STATE_FIELD_NUMBER: _ClassVar[int] + CITY_FIELD_NUMBER: _ClassVar[int] + country_code: str + state: str + city: str + def __init__(self, country_code: _Optional[str] = ..., state: _Optional[str] = ..., city: _Optional[str] = ...) -> None: ... + USER_ID_FIELD_NUMBER: _ClassVar[int] + USER_EMAIL_FIELD_NUMBER: _ClassVar[int] + USER_IP_FIELD_NUMBER: _ClassVar[int] + USER_LOCATION_FIELD_NUMBER: _ClassVar[int] + USER_CREATE_TIME_FIELD_NUMBER: _ClassVar[int] + USER_DISPLAY_NAME_FIELD_NUMBER: _ClassVar[int] + user_id: str + user_email: str + user_ip: str + user_location: EventProperties.UserProperties.Location + user_create_time: _timestamp_pb2.Timestamp + user_display_name: str + def __init__(self, user_id: _Optional[str] = ..., user_email: _Optional[str] = ..., user_ip: _Optional[str] = ..., user_location: _Optional[_Union[EventProperties.UserProperties.Location, _Mapping]] = ..., user_create_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., user_display_name: _Optional[str] = ...) -> None: ... + class FeedbackProperties(_message.Message): + __slots__ = ("session_id", "message_index_hint", "feedback_target", "type") + class Target(int, metaclass=_enum_type_wrapper.EnumTypeWrapper): + __slots__ = () + TARGET_UNSPECIFIED: _ClassVar[EventProperties.FeedbackProperties.Target] + TARGET_SESSION: _ClassVar[EventProperties.FeedbackProperties.Target] + TARGET_MESSAGE: _ClassVar[EventProperties.FeedbackProperties.Target] + TARGET_UNSPECIFIED: EventProperties.FeedbackProperties.Target + TARGET_SESSION: EventProperties.FeedbackProperties.Target + TARGET_MESSAGE: EventProperties.FeedbackProperties.Target + SESSION_ID_FIELD_NUMBER: _ClassVar[int] + MESSAGE_INDEX_HINT_FIELD_NUMBER: _ClassVar[int] + FEEDBACK_TARGET_FIELD_NUMBER: _ClassVar[int] + TYPE_FIELD_NUMBER: _ClassVar[int] + session_id: str + message_index_hint: int + feedback_target: EventProperties.FeedbackProperties.Target + type: str + def __init__(self, session_id: _Optional[str] = ..., message_index_hint: _Optional[int] = ..., feedback_target: _Optional[_Union[EventProperties.FeedbackProperties.Target, str]] = ..., type: _Optional[str] = ...) -> None: ... + class CustomPropertyValue(_message.Message): + __slots__ = ("string_value",) + STRING_VALUE_FIELD_NUMBER: _ClassVar[int] + string_value: str + def __init__(self, string_value: _Optional[str] = ...) -> None: ... + class CustomPropertiesEntry(_message.Message): + __slots__ = ("key", "value") + KEY_FIELD_NUMBER: _ClassVar[int] + VALUE_FIELD_NUMBER: _ClassVar[int] + key: str + value: EventProperties.CustomPropertyValue + def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[EventProperties.CustomPropertyValue, _Mapping]] = ...) -> None: ... + SESSION_PROPERTIES_FIELD_NUMBER: _ClassVar[int] + MESSAGE_PROPERTIES_FIELD_NUMBER: _ClassVar[int] + USER_PROPERTIES_FIELD_NUMBER: _ClassVar[int] + FEEDBACK_PROPERTIES_FIELD_NUMBER: _ClassVar[int] + CUSTOM_PROPERTIES_FIELD_NUMBER: _ClassVar[int] + session_properties: EventProperties.SessionProperties + message_properties: EventProperties.MessageProperties + user_properties: EventProperties.UserProperties + feedback_properties: EventProperties.FeedbackProperties + custom_properties: _containers.MessageMap[str, EventProperties.CustomPropertyValue] + def __init__(self, session_properties: _Optional[_Union[EventProperties.SessionProperties, _Mapping]] = ..., message_properties: _Optional[_Union[EventProperties.MessageProperties, _Mapping]] = ..., user_properties: _Optional[_Union[EventProperties.UserProperties, _Mapping]] = ..., feedback_properties: _Optional[_Union[EventProperties.FeedbackProperties, _Mapping]] = ..., custom_properties: _Optional[_Mapping[str, EventProperties.CustomPropertyValue]] = ...) -> None: ... diff --git a/alignai/proto/ingestion/v1alpha/ingestion_pb2.py b/alignai/proto/ingestion/v1alpha/ingestion_pb2.py new file mode 100644 index 0000000..397048b --- /dev/null +++ b/alignai/proto/ingestion/v1alpha/ingestion_pb2.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE +# source: ingestion/v1alpha/ingestion.proto +# Protobuf Python Version: 5.28.1 +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version +from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 28, + 1, + '', + 'ingestion/v1alpha/ingestion.proto' +) +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!ingestion/v1alpha/ingestion.proto\x12\x11ingestion.v1alpha\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1dingestion/v1alpha/event.proto\"q\n\x14\x43ollectEventsRequest\x12\"\n\nrequest_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\trequestId\x12\x35\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x18.ingestion.v1alpha.EventB\x03\xe0\x41\x02R\x06\x65vents2f\n\x10IngestionService\x12R\n\rCollectEvents\x12\'.ingestion.v1alpha.CollectEventsRequest\x1a\x16.google.protobuf.Empty\"\x00\x42\xdb\x01\n\x15\x63om.ingestion.v1alphaB\x0eIngestionProtoP\x01ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\xa2\x02\x03IXX\xaa\x02\x11Ingestion.V1alpha\xca\x02\x11Ingestion\\V1alpha\xe2\x02\x1dIngestion\\V1alpha\\GPBMetadata\xea\x02\x12Ingestion::V1alphab\x06proto3') + +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ingestion.v1alpha.ingestion_pb2', _globals) +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None + _globals['DESCRIPTOR']._serialized_options = b'\n\025com.ingestion.v1alphaB\016IngestionProtoP\001ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\242\002\003IXX\252\002\021Ingestion.V1alpha\312\002\021Ingestion\\V1alpha\342\002\035Ingestion\\V1alpha\\GPBMetadata\352\002\022Ingestion::V1alpha' + _globals['_COLLECTEVENTSREQUEST'].fields_by_name['request_id']._loaded_options = None + _globals['_COLLECTEVENTSREQUEST'].fields_by_name['request_id']._serialized_options = b'\340A\002' + _globals['_COLLECTEVENTSREQUEST'].fields_by_name['events']._loaded_options = None + _globals['_COLLECTEVENTSREQUEST'].fields_by_name['events']._serialized_options = b'\340A\002' + _globals['_COLLECTEVENTSREQUEST']._serialized_start=149 + _globals['_COLLECTEVENTSREQUEST']._serialized_end=262 + _globals['_INGESTIONSERVICE']._serialized_start=264 + _globals['_INGESTIONSERVICE']._serialized_end=366 +# @@protoc_insertion_point(module_scope) diff --git a/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi b/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi new file mode 100644 index 0000000..12e1733 --- /dev/null +++ b/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi @@ -0,0 +1,17 @@ +from google.protobuf import empty_pb2 as _empty_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): + __slots__ = ("request_id", "events") + REQUEST_ID_FIELD_NUMBER: _ClassVar[int] + EVENTS_FIELD_NUMBER: _ClassVar[int] + request_id: str + events: _containers.RepeatedCompositeFieldContainer[_event_pb2.Event] + def __init__(self, request_id: _Optional[str] = ..., events: _Optional[_Iterable[_Union[_event_pb2.Event, _Mapping]]] = ...) -> None: ... diff --git a/alignai/utils.py b/alignai/utils.py index 7f5f4dc..9172023 100644 --- a/alignai/utils.py +++ b/alignai/utils.py @@ -2,7 +2,7 @@ from typing import Mapping, Dict from google.protobuf.timestamp_pb2 import Timestamp -from ingestion.v1alpha.event_pb2 import EventProperties +from alignai.proto.ingestion.v1alpha.event_pb2 import EventProperties def datetime_to_timestamp(dt: datetime) -> Timestamp: diff --git a/poetry.lock b/poetry.lock index a3f56d6..2b94342 100644 --- a/poetry.lock +++ b/poetry.lock @@ -235,42 +235,119 @@ testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "diff-cover (>=9.2)", "p typing = ["typing-extensions (>=4.12.2)"] [[package]] -name = "googleapis-googleapis-protocolbuffers-pyi" -version = "28.2.0.1.20240827201746+e7f8d366f526" -description = "This package contains generated code for the protobuf module googleapis/googleapis when generated with the plugin protocolbuffers/pyi." +name = "googleapis-common-protos" +version = "1.65.0" +description = "Common protobufs used in Google APIs" optional = false -python-versions = ">=3.8" +python-versions = ">=3.7" files = [ - {file = "googleapis_googleapis_protocolbuffers_pyi-28.2.0.1.20240827201746+e7f8d366f526-py3-none-any.whl", hash = "sha256:5b8b9d250e6acf3d17c87b7a83fa3d35deba22c83c8f8fa88360aab2efba2906"}, + {file = "googleapis_common_protos-1.65.0-py2.py3-none-any.whl", hash = "sha256:2972e6c496f435b92590fd54045060867f3fe9be2c82ab148fc8885035479a63"}, + {file = "googleapis_common_protos-1.65.0.tar.gz", hash = "sha256:334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0"}, ] [package.dependencies] -protobuf = ">=5.28.2,<5.29.0" -types-protobuf = ">=5.27,<6.0" +protobuf = ">=3.20.2,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0.dev0" -[package.source] -type = "legacy" -url = "https://buf.build/gen/python" -reference = "buf" +[package.extras] +grpc = ["grpcio (>=1.44.0,<2.0.0.dev0)"] [[package]] -name = "googleapis-googleapis-protocolbuffers-python" -version = "28.2.0.1.20240827201746+e7f8d366f526" -description = "This package contains generated code for the protobuf module googleapis/googleapis when generated with the plugin protocolbuffers/python." +name = "googleapis-common-protos-stubs" +version = "2.3.1" +description = "Type stubs for googleapis-common-protos" optional = false -python-versions = ">=3.8" +python-versions = ">=3.7,<4.0" files = [ - {file = "googleapis_googleapis_protocolbuffers_python-28.2.0.1.20240827201746+e7f8d366f526-py3-none-any.whl", hash = "sha256:f3a86c286643100af5a4982ebff15f52fe0eba636d56f8548429f29b3db0de58"}, + {file = "googleapis_common_protos_stubs-2.3.1-py3-none-any.whl", hash = "sha256:ce9a162829d8fe2c80461996f8f1cbef0ee50427501346416f9fc04ec226e9e1"}, + {file = "googleapis_common_protos_stubs-2.3.1.tar.gz", hash = "sha256:c3cea451c4810e3c18776e9199186cd3ec21a7e6c90d12a983c1216e185e9175"}, ] [package.dependencies] -googleapis-googleapis-protocolbuffers-pyi = ">=28.2.0.1.20240827201746" -protobuf = ">=5.28.2,<5.29.0" +googleapis-common-protos = ">=1.62.0" +grpc-stubs = ">=1.53.0.5" +types-protobuf = ">=3.20.4.2" +typing-extensions = ">=3.10.0" + +[[package]] +name = "grpc-stubs" +version = "1.53.0.5" +description = "Mypy stubs for gRPC" +optional = false +python-versions = ">=3.6" +files = [ + {file = "grpc-stubs-1.53.0.5.tar.gz", hash = "sha256:3e1b642775cbc3e0c6332cfcedfccb022176db87e518757bef3a1241397be406"}, + {file = "grpc_stubs-1.53.0.5-py3-none-any.whl", hash = "sha256:04183fb65a1b166a1febb9627e3d9647d3926ccc2dfe049fe7b6af243428dbe1"}, +] -[package.source] -type = "legacy" -url = "https://buf.build/gen/python" -reference = "buf" +[package.dependencies] +grpcio = "*" + +[[package]] +name = "grpcio" +version = "1.66.2" +description = "HTTP/2-based RPC framework" +optional = false +python-versions = ">=3.8" +files = [ + {file = "grpcio-1.66.2-cp310-cp310-linux_armv7l.whl", hash = "sha256:fe96281713168a3270878255983d2cb1a97e034325c8c2c25169a69289d3ecfa"}, + {file = "grpcio-1.66.2-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:73fc8f8b9b5c4a03e802b3cd0c18b2b06b410d3c1dcbef989fdeb943bd44aff7"}, + {file = "grpcio-1.66.2-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:03b0b307ba26fae695e067b94cbb014e27390f8bc5ac7a3a39b7723fed085604"}, + {file = "grpcio-1.66.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d69ce1f324dc2d71e40c9261d3fdbe7d4c9d60f332069ff9b2a4d8a257c7b2b"}, + {file = "grpcio-1.66.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05bc2ceadc2529ab0b227b1310d249d95d9001cd106aa4d31e8871ad3c428d73"}, + {file = "grpcio-1.66.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8ac475e8da31484efa25abb774674d837b343afb78bb3bcdef10f81a93e3d6bf"}, + {file = "grpcio-1.66.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0be4e0490c28da5377283861bed2941d1d20ec017ca397a5df4394d1c31a9b50"}, + {file = "grpcio-1.66.2-cp310-cp310-win32.whl", hash = "sha256:4e504572433f4e72b12394977679161d495c4c9581ba34a88d843eaf0f2fbd39"}, + {file = "grpcio-1.66.2-cp310-cp310-win_amd64.whl", hash = "sha256:2018b053aa15782db2541ca01a7edb56a0bf18c77efed975392583725974b249"}, + {file = "grpcio-1.66.2-cp311-cp311-linux_armv7l.whl", hash = "sha256:2335c58560a9e92ac58ff2bc5649952f9b37d0735608242973c7a8b94a6437d8"}, + {file = "grpcio-1.66.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:45a3d462826f4868b442a6b8fdbe8b87b45eb4f5b5308168c156b21eca43f61c"}, + {file = "grpcio-1.66.2-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a9539f01cb04950fd4b5ab458e64a15f84c2acc273670072abe49a3f29bbad54"}, + {file = "grpcio-1.66.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce89f5876662f146d4c1f695dda29d4433a5d01c8681fbd2539afff535da14d4"}, + {file = "grpcio-1.66.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d25a14af966438cddf498b2e338f88d1c9706f3493b1d73b93f695c99c5f0e2a"}, + {file = "grpcio-1.66.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6001e575b8bbd89eee11960bb640b6da6ae110cf08113a075f1e2051cc596cae"}, + {file = "grpcio-1.66.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4ea1d062c9230278793820146c95d038dc0f468cbdd172eec3363e42ff1c7d01"}, + {file = "grpcio-1.66.2-cp311-cp311-win32.whl", hash = "sha256:38b68498ff579a3b1ee8f93a05eb48dc2595795f2f62716e797dc24774c1aaa8"}, + {file = "grpcio-1.66.2-cp311-cp311-win_amd64.whl", hash = "sha256:6851de821249340bdb100df5eacfecfc4e6075fa85c6df7ee0eb213170ec8e5d"}, + {file = "grpcio-1.66.2-cp312-cp312-linux_armv7l.whl", hash = "sha256:802d84fd3d50614170649853d121baaaa305de7b65b3e01759247e768d691ddf"}, + {file = "grpcio-1.66.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:80fd702ba7e432994df208f27514280b4b5c6843e12a48759c9255679ad38db8"}, + {file = "grpcio-1.66.2-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:12fda97ffae55e6526825daf25ad0fa37483685952b5d0f910d6405c87e3adb6"}, + {file = "grpcio-1.66.2-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:950da58d7d80abd0ea68757769c9db0a95b31163e53e5bb60438d263f4bed7b7"}, + {file = "grpcio-1.66.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e636ce23273683b00410f1971d209bf3689238cf5538d960adc3cdfe80dd0dbd"}, + {file = "grpcio-1.66.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a917d26e0fe980b0ac7bfcc1a3c4ad6a9a4612c911d33efb55ed7833c749b0ee"}, + {file = "grpcio-1.66.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:49f0ca7ae850f59f828a723a9064cadbed90f1ece179d375966546499b8a2c9c"}, + {file = "grpcio-1.66.2-cp312-cp312-win32.whl", hash = "sha256:31fd163105464797a72d901a06472860845ac157389e10f12631025b3e4d0453"}, + {file = "grpcio-1.66.2-cp312-cp312-win_amd64.whl", hash = "sha256:ff1f7882e56c40b0d33c4922c15dfa30612f05fb785074a012f7cda74d1c3679"}, + {file = "grpcio-1.66.2-cp313-cp313-linux_armv7l.whl", hash = "sha256:3b00efc473b20d8bf83e0e1ae661b98951ca56111feb9b9611df8efc4fe5d55d"}, + {file = "grpcio-1.66.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:1caa38fb22a8578ab8393da99d4b8641e3a80abc8fd52646f1ecc92bcb8dee34"}, + {file = "grpcio-1.66.2-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:c408f5ef75cfffa113cacd8b0c0e3611cbfd47701ca3cdc090594109b9fcbaed"}, + {file = "grpcio-1.66.2-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c806852deaedee9ce8280fe98955c9103f62912a5b2d5ee7e3eaa284a6d8d8e7"}, + {file = "grpcio-1.66.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f145cc21836c332c67baa6fc81099d1d27e266401565bf481948010d6ea32d46"}, + {file = "grpcio-1.66.2-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:73e3b425c1e155730273f73e419de3074aa5c5e936771ee0e4af0814631fb30a"}, + {file = "grpcio-1.66.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:9c509a4f78114cbc5f0740eb3d7a74985fd2eff022971bc9bc31f8bc93e66a3b"}, + {file = "grpcio-1.66.2-cp313-cp313-win32.whl", hash = "sha256:20657d6b8cfed7db5e11b62ff7dfe2e12064ea78e93f1434d61888834bc86d75"}, + {file = "grpcio-1.66.2-cp313-cp313-win_amd64.whl", hash = "sha256:fb70487c95786e345af5e854ffec8cb8cc781bcc5df7930c4fbb7feaa72e1cdf"}, + {file = "grpcio-1.66.2-cp38-cp38-linux_armv7l.whl", hash = "sha256:a18e20d8321c6400185b4263e27982488cb5cdd62da69147087a76a24ef4e7e3"}, + {file = "grpcio-1.66.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:02697eb4a5cbe5a9639f57323b4c37bcb3ab2d48cec5da3dc2f13334d72790dd"}, + {file = "grpcio-1.66.2-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:99a641995a6bc4287a6315989ee591ff58507aa1cbe4c2e70d88411c4dcc0839"}, + {file = "grpcio-1.66.2-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ed71e81782966ffead60268bbda31ea3f725ebf8aa73634d5dda44f2cf3fb9c"}, + {file = "grpcio-1.66.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbd27c24a4cc5e195a7f56cfd9312e366d5d61b86e36d46bbe538457ea6eb8dd"}, + {file = "grpcio-1.66.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d9a9724a156c8ec6a379869b23ba3323b7ea3600851c91489b871e375f710bc8"}, + {file = "grpcio-1.66.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d8d4732cc5052e92cea2f78b233c2e2a52998ac40cd651f40e398893ad0d06ec"}, + {file = "grpcio-1.66.2-cp38-cp38-win32.whl", hash = "sha256:7b2c86457145ce14c38e5bf6bdc19ef88e66c5fee2c3d83285c5aef026ba93b3"}, + {file = "grpcio-1.66.2-cp38-cp38-win_amd64.whl", hash = "sha256:e88264caad6d8d00e7913996030bac8ad5f26b7411495848cc218bd3a9040b6c"}, + {file = "grpcio-1.66.2-cp39-cp39-linux_armv7l.whl", hash = "sha256:c400ba5675b67025c8a9f48aa846f12a39cf0c44df5cd060e23fda5b30e9359d"}, + {file = "grpcio-1.66.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:66a0cd8ba6512b401d7ed46bb03f4ee455839957f28b8d61e7708056a806ba6a"}, + {file = "grpcio-1.66.2-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:06de8ec0bd71be123eec15b0e0d457474931c2c407869b6c349bd9bed4adbac3"}, + {file = "grpcio-1.66.2-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb57870449dfcfac428afbb5a877829fcb0d6db9d9baa1148705739e9083880e"}, + {file = "grpcio-1.66.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b672abf90a964bfde2d0ecbce30f2329a47498ba75ce6f4da35a2f4532b7acbc"}, + {file = "grpcio-1.66.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ad2efdbe90c73b0434cbe64ed372e12414ad03c06262279b104a029d1889d13e"}, + {file = "grpcio-1.66.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c3a99c519f4638e700e9e3f83952e27e2ea10873eecd7935823dab0c1c9250e"}, + {file = "grpcio-1.66.2-cp39-cp39-win32.whl", hash = "sha256:78fa51ebc2d9242c0fc5db0feecc57a9943303b46664ad89921f5079e2e4ada7"}, + {file = "grpcio-1.66.2-cp39-cp39-win_amd64.whl", hash = "sha256:728bdf36a186e7f51da73be7f8d09457a03061be848718d0edf000e709418987"}, + {file = "grpcio-1.66.2.tar.gz", hash = "sha256:563588c587b75c34b928bc428548e5b00ea38c46972181a4d8b75ba7e3f24231"}, +] + +[package.extras] +protobuf = ["grpcio-tools (>=1.66.2)"] [[package]] name = "identify" @@ -300,46 +377,6 @@ files = [ [package.extras] all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"] -[[package]] -name = "impaction-ai-ingestion-protocolbuffers-pyi" -version = "28.2.0.1.20240908234409+342910308823" -description = "This package contains generated code for the protobuf module impaction-ai/ingestion when generated with the plugin protocolbuffers/pyi." -optional = false -python-versions = ">=3.8" -files = [ - {file = "impaction_ai_ingestion_protocolbuffers_pyi-28.2.0.1.20240908234409+342910308823-py3-none-any.whl", hash = "sha256:f23d93d51c5ccb6b9e43a45848747f5e2e1a5804a49e289a729129da4893c9b6"}, -] - -[package.dependencies] -googleapis-googleapis-protocolbuffers-pyi = ">=28.2.0.1.20240729201550" -protobuf = ">=5.28.2,<5.29.0" -types-protobuf = ">=5.27,<6.0" - -[package.source] -type = "legacy" -url = "https://buf.build/gen/python" -reference = "buf" - -[[package]] -name = "impaction-ai-ingestion-protocolbuffers-python" -version = "28.2.0.1.20240908234409+342910308823" -description = "This package contains generated code for the protobuf module impaction-ai/ingestion when generated with the plugin protocolbuffers/python." -optional = false -python-versions = ">=3.8" -files = [ - {file = "impaction_ai_ingestion_protocolbuffers_python-28.2.0.1.20240908234409+342910308823-py3-none-any.whl", hash = "sha256:c2650f45a9145e2a4d0cf719b48e763be577efe7e07aa8bf7de2e99e799be79d"}, -] - -[package.dependencies] -googleapis-googleapis-protocolbuffers-python = ">=28.2.0.1.20240729201550" -impaction-ai-ingestion-protocolbuffers-pyi = ">=28.2.0.1.20240908234409" -protobuf = ">=5.28.2,<5.29.0" - -[package.source] -type = "legacy" -url = "https://buf.build/gen/python" -reference = "buf" - [[package]] name = "isort" version = "5.13.2" @@ -681,4 +718,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = ">=3.8.0,<4.0" -content-hash = "fc427ce6cf6a8010bb54aa94b8f56561ad46094adf526304ff6692e6352c359e" +content-hash = "d5d3f57891355f2303387e2db90a5e78da6e6fb74d0e49fdf6cf038e846f6e9b" diff --git a/pyproject.toml b/pyproject.toml index f4b85ae..25b4533 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,11 +10,8 @@ packages = [{include = "alignai"}] [tool.poetry.dependencies] python = ">=3.8.0,<4.0" requests = "^2.31.0" -protobuf = "^5.28.2" -googleapis-googleapis-protocolbuffers-python = "^28.2.0.1.20240827201746+e7f8d366f526" -googleapis-googleapis-protocolbuffers-pyi = "^28.2.0.1.20240827201746+e7f8d366f526" -impaction-ai-ingestion-protocolbuffers-pyi = "28.2.0.1.20240908234409+342910308823" -impaction-ai-ingestion-protocolbuffers-python = "28.2.0.1.20240908234409+342910308823" +protobuf = "^5.28.1" +googleapis-common-protos = "^1.65.0" [tool.poetry.group.dev.dependencies] ruff = "^0.3.7" @@ -23,12 +20,7 @@ mypy = "^1.11.2" isort = "^5.13.2" pre-commit = "^3.5.0" packaging = "^23.2" - - -[[tool.poetry.source]] -name = "buf" -url = "https://buf.build/gen/python" -priority = "supplemental" +googleapis-common-protos-stubs = "^2.3.1" [build-system] requires = ["poetry-core"] @@ -49,7 +41,7 @@ line-length = 120 target-version = ["py38"] exclude = ''' /( - alignai\/ingestion + alignai\/proto | \.venv | venv )/ From 3a9692477cf7b989472056aad49c20475d8290e7 Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Sat, 12 Oct 2024 08:09:26 +0000 Subject: [PATCH 7/9] add missing import in proto stubs --- alignai/proto/ingestion/v1alpha/event_pb2.py | 2 ++ alignai/proto/ingestion/v1alpha/event_pb2.pyi | 1 + alignai/proto/ingestion/v1alpha/ingestion_pb2.py | 3 +++ alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi | 1 + 4 files changed, 7 insertions(+) diff --git a/alignai/proto/ingestion/v1alpha/event_pb2.py b/alignai/proto/ingestion/v1alpha/event_pb2.py index 361c19e..5af7fd7 100644 --- a/alignai/proto/ingestion/v1alpha/event_pb2.py +++ b/alignai/proto/ingestion/v1alpha/event_pb2.py @@ -21,6 +21,8 @@ _sym_db = _symbol_database.Default() +from google.api import field_behavior_pb2 as google_dot_api_dot_field__behavior__pb2 +from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dingestion/v1alpha/event.proto\x12\x11ingestion.v1alpha\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xe4\x01\n\x05\x45vent\x12\x13\n\x02id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x02id\x12\x17\n\x04type\x18\x02 \x01(\tB\x03\xe0\x41\x02R\x04type\x12@\n\x0b\x63reate_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\ncreateTime\x12G\n\nproperties\x18\x04 \x01(\x0b\x32\".ingestion.v1alpha.EventPropertiesB\x03\xe0\x41\x02R\nproperties\x12\"\n\nproject_id\x18\x05 \x01(\tB\x03\xe0\x41\x02R\tprojectId\"\x9e\x11\n\x0f\x45ventProperties\x12\x65\n\x12session_properties\x18\x01 \x01(\x0b\x32\x34.ingestion.v1alpha.EventProperties.SessionPropertiesH\x00R\x11sessionProperties\x12\x65\n\x12message_properties\x18\x02 \x01(\x0b\x32\x34.ingestion.v1alpha.EventProperties.MessagePropertiesH\x00R\x11messageProperties\x12\\\n\x0fuser_properties\x18\x03 \x01(\x0b\x32\x31.ingestion.v1alpha.EventProperties.UserPropertiesH\x00R\x0euserProperties\x12h\n\x13\x66\x65\x65\x64\x62\x61\x63k_properties\x18\x04 \x01(\x0b\x32\x35.ingestion.v1alpha.EventProperties.FeedbackPropertiesH\x00R\x12\x66\x65\x65\x64\x62\x61\x63kProperties\x12j\n\x11\x63ustom_properties\x18\n \x03(\x0b\x32\x38.ingestion.v1alpha.EventProperties.CustomPropertiesEntryB\x03\xe0\x41\x01R\x10\x63ustomProperties\x1a\xf6\x01\n\x11SessionProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12(\n\rsession_title\x18\x02 \x01(\tB\x03\xe0\x41\x01R\x0csessionTitle\x12M\n\x12session_start_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x10sessionStartTime\x12\x1c\n\x07user_id\x18\x04 \x01(\tB\x03\xe0\x41\x02R\x06userId\x12&\n\x0c\x61ssistant_id\x18\x05 \x01(\tB\x03\xe0\x41\x01R\x0b\x61ssistantId\x1a\xbc\x03\n\x11MessageProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12-\n\x0fmessage_id_hint\x18\x02 \x01(\tB\x05\x18\x01\xe0\x41\x01R\rmessageIdHint\x12\x31\n\x12message_index_hint\x18\x03 \x01(\x05\x42\x03\xe0\x41\x02R\x10messageIndexHint\x12\x61\n\x0cmessage_role\x18\x04 \x01(\x0e\x32\x39.ingestion.v1alpha.EventProperties.MessageProperties.RoleB\x03\xe0\x41\x02R\x0bmessageRole\x12,\n\x0fmessage_content\x18\x05 \x01(\tB\x03\xe0\x41\x02R\x0emessageContent\x12O\n\x13message_create_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x11messageCreateTime\"?\n\x04Role\x12\x14\n\x10ROLE_UNSPECIFIED\x10\x00\x12\r\n\tROLE_USER\x10\x01\x12\x12\n\x0eROLE_ASSISTANT\x10\x02\x1a\xba\x03\n\x0eUserProperties\x12\x1c\n\x07user_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x06userId\x12\"\n\nuser_email\x18\x02 \x01(\tB\x03\xe0\x41\x01R\tuserEmail\x12\x1c\n\x07user_ip\x18\x03 \x01(\tB\x03\xe0\x41\x01R\x06userIp\x12\x64\n\ruser_location\x18\x04 \x01(\x0b\x32:.ingestion.v1alpha.EventProperties.UserProperties.LocationB\x03\xe0\x41\x01R\x0cuserLocation\x12I\n\x10user_create_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x03\xe0\x41\x01R\x0euserCreateTime\x12/\n\x11user_display_name\x18\x06 \x01(\tB\x03\xe0\x41\x01R\x0fuserDisplayName\x1a\x66\n\x08Location\x12&\n\x0c\x63ountry_code\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x0b\x63ountryCode\x12\x19\n\x05state\x18\x02 \x01(\tB\x03\xe0\x41\x01R\x05state\x12\x17\n\x04\x63ity\x18\x03 \x01(\tB\x03\xe0\x41\x01R\x04\x63ity\x1a\xba\x02\n\x12\x46\x65\x65\x64\x62\x61\x63kProperties\x12\"\n\nsession_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\tsessionId\x12\x31\n\x12message_index_hint\x18\x02 \x01(\x05\x42\x03\xe0\x41\x01R\x10messageIndexHint\x12j\n\x0f\x66\x65\x65\x64\x62\x61\x63k_target\x18\x03 \x01(\x0e\x32<.ingestion.v1alpha.EventProperties.FeedbackProperties.TargetB\x03\xe0\x41\x02R\x0e\x66\x65\x65\x64\x62\x61\x63kTarget\x12\x17\n\x04type\x18\x04 \x01(\tB\x03\xe0\x41\x02R\x04type\"H\n\x06Target\x12\x16\n\x12TARGET_UNSPECIFIED\x10\x00\x12\x12\n\x0eTARGET_SESSION\x10\x01\x12\x12\n\x0eTARGET_MESSAGE\x10\x02\x1a=\n\x13\x43ustomPropertyValue\x12&\n\x0cstring_value\x18\x01 \x01(\tB\x03\xe0\x41\x02R\x0bstringValue\x1a{\n\x15\x43ustomPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12L\n\x05value\x18\x02 \x01(\x0b\x32\x36.ingestion.v1alpha.EventProperties.CustomPropertyValueR\x05value:\x02\x38\x01\x42\x15\n\x13reserved_propertiesJ\x04\x08\x05\x10\nB\xd7\x01\n\x15\x63om.ingestion.v1alphaB\nEventProtoP\x01ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\xa2\x02\x03IXX\xaa\x02\x11Ingestion.V1alpha\xca\x02\x11Ingestion\\V1alpha\xe2\x02\x1dIngestion\\V1alpha\\GPBMetadata\xea\x02\x12Ingestion::V1alphab\x06proto3') diff --git a/alignai/proto/ingestion/v1alpha/event_pb2.pyi b/alignai/proto/ingestion/v1alpha/event_pb2.pyi index c59aaa7..e89f723 100644 --- a/alignai/proto/ingestion/v1alpha/event_pb2.pyi +++ b/alignai/proto/ingestion/v1alpha/event_pb2.pyi @@ -1,3 +1,4 @@ +from google.api import field_behavior_pb2 as _field_behavior_pb2 from google.protobuf import timestamp_pb2 as _timestamp_pb2 from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper diff --git a/alignai/proto/ingestion/v1alpha/ingestion_pb2.py b/alignai/proto/ingestion/v1alpha/ingestion_pb2.py index 397048b..50ad99d 100644 --- a/alignai/proto/ingestion/v1alpha/ingestion_pb2.py +++ b/alignai/proto/ingestion/v1alpha/ingestion_pb2.py @@ -21,6 +21,9 @@ _sym_db = _symbol_database.Default() +from google.api import field_behavior_pb2 as google_dot_api_dot_field__behavior__pb2 +from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 +from alignai.proto.ingestion.v1alpha import event_pb2 as ingestion_dot_v1alpha_dot_event__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!ingestion/v1alpha/ingestion.proto\x12\x11ingestion.v1alpha\x1a\x1fgoogle/api/field_behavior.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1dingestion/v1alpha/event.proto\"q\n\x14\x43ollectEventsRequest\x12\"\n\nrequest_id\x18\x01 \x01(\tB\x03\xe0\x41\x02R\trequestId\x12\x35\n\x06\x65vents\x18\x02 \x03(\x0b\x32\x18.ingestion.v1alpha.EventB\x03\xe0\x41\x02R\x06\x65vents2f\n\x10IngestionService\x12R\n\rCollectEvents\x12\'.ingestion.v1alpha.CollectEventsRequest\x1a\x16.google.protobuf.Empty\"\x00\x42\xdb\x01\n\x15\x63om.ingestion.v1alphaB\x0eIngestionProtoP\x01ZMgithub.com/coxwave/impaction-ai-api/gen/go/ingestion/v1alpha;ingestionv1alpha\xa2\x02\x03IXX\xaa\x02\x11Ingestion.V1alpha\xca\x02\x11Ingestion\\V1alpha\xe2\x02\x1dIngestion\\V1alpha\\GPBMetadata\xea\x02\x12Ingestion::V1alphab\x06proto3') diff --git a/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi b/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi index 12e1733..da54de8 100644 --- a/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi +++ b/alignai/proto/ingestion/v1alpha/ingestion_pb2.pyi @@ -1,3 +1,4 @@ +from google.api import field_behavior_pb2 as _field_behavior_pb2 from google.protobuf import empty_pb2 as _empty_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor From d6b6de9006cdd45ed84e213def22f874d4022fee Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Sat, 12 Oct 2024 08:09:42 +0000 Subject: [PATCH 8/9] bump to dev2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 25b4533..e908153 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "alignai" -version = "0.3.0.dev1" +version = "0.3.0.dev2" description = "Python SDK for Align AI" authors = ["Coxwave "] readme = "README.md" From 8583b837b4a68f87bfcc38eb825b5a8e522e5c12 Mon Sep 17 00:00:00 2001 From: Dongeon Kim Date: Sat, 12 Oct 2024 08:16:49 +0000 Subject: [PATCH 9/9] bump to dev3 --- alignai/client.py | 3 +-- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/alignai/client.py b/alignai/client.py index 421b391..9519686 100644 --- a/alignai/client.py +++ b/alignai/client.py @@ -4,8 +4,7 @@ import uuid from datetime import datetime, timezone -from ingestion.v1alpha.event_pb2 import Event, EventProperties - +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 diff --git a/pyproject.toml b/pyproject.toml index e908153..ed98349 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "alignai" -version = "0.3.0.dev2" +version = "0.3.0.dev3" description = "Python SDK for Align AI" authors = ["Coxwave "] readme = "README.md"