From 9caf2713e4a15deb3b6ad2585a8e4942997c1810 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 17 Jul 2025 15:19:01 -0700 Subject: [PATCH 01/10] removing intermediate folders --- .../agents/authentication/msal/__init__.py | 0 .../agents/authentication/msal/msal_auth.py | 0 .../msal/msal_connection_manager.py | 0 .../pyproject.toml | 0 .../agents/authorization/__init__.py | 0 .../access_token_provider_base.py | 0 .../authorization/agent_auth_configuration.py | 0 .../authorization/anonymous_token_provider.py | 0 .../agents/authorization/auth_types.py | 0 .../authorization/authentication_constants.py | 0 .../agents/authorization/claims_identity.py | 0 .../agents/authorization/connections.py | 0 .../authorization/jwt_token_validator.py | 0 .../pyproject.toml | 0 .../microsoft/agents/blob/__init__.py | 6 +- .../microsoft/agents/blob/blob_storage.py | 348 +++++++++--------- .../microsoft-agents-blob/pyproject.toml | 46 +-- .../tests/test_blob_storage.py | 0 .../microsoft/agents/builder/__init__.py | 0 .../agents/builder/activity_handler.py | 0 .../microsoft/agents/builder/agent.py | 0 .../microsoft/agents/builder/app/__init__.py | 0 .../agents/builder/app/agent_application.py | 0 .../microsoft/agents/builder/app/app_error.py | 0 .../agents/builder/app/app_options.py | 0 .../agents/builder/app/input_file.py | 0 .../agents/builder/app/oauth/__init__.py | 0 .../agents/builder/app/oauth/authorization.py | 0 .../microsoft/agents/builder/app/query.py | 0 .../microsoft/agents/builder/app/route.py | 0 .../agents/builder/app/state/__init__.py | 0 .../builder/app/state/conversation_state.py | 0 .../agents/builder/app/state/state.py | 0 .../agents/builder/app/state/temp_state.py | 0 .../agents/builder/app/state/turn_state.py | 0 .../agents/builder/app/typing_indicator.py | 0 .../microsoft/agents/builder/card_factory.py | 0 .../agents/builder/channel_adapter.py | 0 .../builder/channel_api_handler_protocol.py | 0 .../agents/builder/channel_service_adapter.py | 0 .../channel_service_client_factory_base.py | 0 .../agents/builder/message_factory.py | 0 .../agents/builder/middleware_set.py | 0 .../microsoft/agents/builder/oauth_flow.py | 0 .../rest_channel_service_client_factory.py | 0 .../agents/builder/state/__init__.py | 0 .../agents/builder/state/agent_state.py | 0 .../builder/state/state_property_accessor.py | 0 .../agents/builder/state/user_state.py | 0 .../microsoft/agents/builder/turn_context.py | 0 .../microsoft-agents-builder/pyproject.toml | 0 .../tests/__init__.py | 0 .../tests/test_activity_handler.py | 0 .../tests/test_agent_state.py | 0 .../tests/test_state.py | 0 .../tests/test_turn_context.py | 0 .../tests/tools/testing_adapter.py | 0 .../tests/tools/testing_flow.py | 0 .../tests/tools/testing_utility.py | 0 .../microsoft/agents/client/__init__.py | 0 .../client/agent_conversation_reference.py | 0 .../agents/client/channel_factory_protocol.py | 0 .../agents/client/channel_host_protocol.py | 0 .../agents/client/channel_info_protocol.py | 0 .../agents/client/channel_protocol.py | 0 .../agents/client/channels_configuration.py | 0 .../client/configuration_channel_host.py | 0 .../agents/client/conversation_constants.py | 0 .../agents/client/conversation_id_factory.py | 0 .../client/conversation_id_factory_options.py | 0 .../conversation_id_factory_protocol.py | 0 .../agents/client/http_agent_channel.py | 0 .../client/http_agent_channel_factory.py | 0 .../microsoft-agents-client/pyproject.toml | 0 .../microsoft/agents/connector/__init__.py | 0 .../agents/connector/agent_sign_in_base.py | 0 .../agents/connector/attachments_base.py | 0 .../agents/connector/client/__init__.py | 0 .../connector/client/connector_client.py | 0 .../connector/client/user_token_client.py | 0 .../agents/connector/connector_client_base.py | 0 .../agents/connector/conversations_base.py | 0 .../agents/connector/get_product_info.py | 0 .../agents/connector/teams/__init__.py | 0 .../connector/teams/teams_connector_client.py | 0 .../agents/connector/user_token_base.py | 0 .../connector/user_token_client_base.py | 0 .../microsoft-agents-connector/pyproject.toml | 0 .../agents/copilotstudio/client/__init__.py | 0 .../agents/copilotstudio/client/agent_type.py | 0 .../client/connection_settings.py | 0 .../copilotstudio/client/copilot_client.py | 0 ..._to_engine_connection_settings_protocol.py | 0 .../client/execute_turn_request.py | 0 .../client/power_platform_cloud.py | 0 .../client/power_platform_environment.py | 0 .../pyproject.toml | 0 .../microsoft/agents/core/__init__.py | 0 .../agents/core/_load_configuration.py | 0 .../agents/core/channel_adapter_protocol.py | 0 .../microsoft/agents/core/models/__init__.py | 0 .../agents/core/models/_type_aliases.py | 0 .../agents/core/models/action_types.py | 0 .../microsoft/agents/core/models/activity.py | 0 .../core/models/activity_event_names.py | 0 .../agents/core/models/activity_importance.py | 0 .../agents/core/models/activity_types.py | 0 .../models/adaptive_card_invoke_action.py | 0 .../models/adaptive_card_invoke_response.py | 0 .../core/models/adaptive_card_invoke_value.py | 0 .../agents/core/models/agents_model.py | 0 .../microsoft/agents/core/models/ai_entity.py | 0 .../agents/core/models/animation_card.py | 0 .../agents/core/models/attachment.py | 0 .../agents/core/models/attachment_data.py | 0 .../agents/core/models/attachment_info.py | 0 .../core/models/attachment_layout_types.py | 0 .../agents/core/models/attachment_view.py | 0 .../agents/core/models/audio_card.py | 0 .../agents/core/models/basic_card.py | 0 .../agents/core/models/caller_id_constants.py | 0 .../agents/core/models/card_action.py | 0 .../agents/core/models/card_image.py | 0 .../agents/core/models/channel_account.py | 0 .../microsoft/agents/core/models/channels.py | 0 .../contact_relation_update_action_types.py | 0 .../core/models/conversation_account.py | 0 .../core/models/conversation_members.py | 0 .../core/models/conversation_parameters.py | 0 .../core/models/conversation_reference.py | 0 .../models/conversation_resource_response.py | 0 .../core/models/conversation_update_types.py | 0 .../core/models/conversations_result.py | 0 .../agents/core/models/delivery_modes.py | 0 .../core/models/end_of_conversation_codes.py | 0 .../microsoft/agents/core/models/entity.py | 0 .../microsoft/agents/core/models/error.py | 0 .../agents/core/models/error_response.py | 0 .../agents/core/models/expected_replies.py | 0 .../microsoft/agents/core/models/fact.py | 0 .../agents/core/models/geo_coordinates.py | 0 .../microsoft/agents/core/models/hero_card.py | 0 .../agents/core/models/inner_http_error.py | 0 .../agents/core/models/input_hints.py | 0 .../installation_update_action_types.py | 0 .../agents/core/models/invoke_response.py | 0 .../agents/core/models/media_card.py | 0 .../agents/core/models/media_event_value.py | 0 .../microsoft/agents/core/models/media_url.py | 0 .../microsoft/agents/core/models/mention.py | 0 .../agents/core/models/message_reaction.py | 0 .../core/models/message_reaction_types.py | 0 .../core/models/message_update_types.py | 0 .../agents/core/models/oauth_card.py | 0 .../core/models/paged_members_result.py | 0 .../microsoft/agents/core/models/place.py | 0 .../agents/core/models/receipt_card.py | 0 .../agents/core/models/receipt_item.py | 0 .../agents/core/models/resource_response.py | 0 .../agents/core/models/role_types.py | 0 .../agents/core/models/semantic_action.py | 0 .../core/models/semantic_actions_states.py | 0 .../agents/core/models/sign_in_constants.py | 0 .../agents/core/models/sign_in_resource.py | 0 .../agents/core/models/signin_card.py | 0 .../agents/core/models/suggested_actions.py | 0 .../agents/core/models/teams/__init__.py | 0 .../core/models/teams/app_based_link_query.py | 0 .../teams/batch_failed_entries_response.py | 0 .../core/models/teams/batch_failed_entry.py | 0 .../models/teams/batch_operation_response.py | 0 .../teams/batch_operation_state_response.py | 0 .../core/models/teams/bot_config_auth.py | 0 .../agents/core/models/teams/cache_info.py | 0 .../models/teams/cancel_operation_response.py | 0 .../agents/core/models/teams/channel_info.py | 0 .../core/models/teams/config_auth_response.py | 0 .../core/models/teams/config_response.py | 0 .../core/models/teams/config_response_base.py | 0 .../core/models/teams/config_task_response.py | 0 .../core/models/teams/conversation_list.py | 0 .../core/models/teams/file_consent_card.py | 0 .../teams/file_consent_card_response.py | 0 .../core/models/teams/file_download_info.py | 0 .../core/models/teams/file_info_card.py | 0 .../core/models/teams/file_upload_info.py | 0 .../core/models/teams/meeting_details.py | 0 .../core/models/teams/meeting_details_base.py | 0 .../models/teams/meeting_end_event_details.py | 0 .../models/teams/meeting_event_details.py | 0 .../agents/core/models/teams/meeting_info.py | 0 .../core/models/teams/meeting_notification.py | 0 .../models/teams/meeting_notification_base.py | 0 .../meeting_notification_channel_data.py | 0 ...ing_notification_recipient_failure_info.py | 0 .../teams/meeting_notification_response.py | 0 .../models/teams/meeting_participant_info.py | 0 .../meeting_participants_event_details.py | 0 .../models/teams/meeting_stage_surface.py | 0 .../teams/meeting_start_event_details.py | 0 .../models/teams/meeting_tab_icon_surface.py | 0 .../models/teams/message_actions_payload.py | 0 .../teams/message_actions_payload_app.py | 0 .../message_actions_payload_attachment.py | 0 .../teams/message_actions_payload_body.py | 0 .../message_actions_payload_conversation.py | 0 .../teams/message_actions_payload_from.py | 0 .../teams/message_actions_payload_mention.py | 0 .../teams/message_actions_payload_reaction.py | 0 .../teams/message_actions_payload_user.py | 0 .../teams/messaging_extension_action.py | 0 .../messaging_extension_action_response.py | 0 .../teams/messaging_extension_attachment.py | 0 .../teams/messaging_extension_parameter.py | 0 .../models/teams/messaging_extension_query.py | 0 .../messaging_extension_query_options.py | 0 .../teams/messaging_extension_response.py | 0 .../teams/messaging_extension_result.py | 0 .../messaging_extension_suggested_action.py | 0 .../core/models/teams/notification_info.py | 0 .../core/models/teams/o365_connector_card.py | 0 .../teams/o365_connector_card_action_base.py | 0 .../teams/o365_connector_card_action_card.py | 0 .../teams/o365_connector_card_action_query.py | 0 .../teams/o365_connector_card_date_input.py | 0 .../models/teams/o365_connector_card_fact.py | 0 .../teams/o365_connector_card_http_post.py | 0 .../models/teams/o365_connector_card_image.py | 0 .../teams/o365_connector_card_input_base.py | 0 .../o365_connector_card_multichoice_input.py | 0 ...connector_card_multichoice_input_choice.py | 0 .../teams/o365_connector_card_open_uri.py | 0 .../o365_connector_card_open_uri_target.py | 0 .../teams/o365_connector_card_section.py | 0 .../teams/o365_connector_card_text_input.py | 0 .../teams/o365_connector_card_view_action.py | 0 .../agents/core/models/teams/on_behalf_of.py | 0 .../core/models/teams/read_receipt_info.py | 0 .../teams/signin_state_verification_query.py | 0 .../agents/core/models/teams/surface.py | 0 .../agents/core/models/teams/tab_context.py | 0 .../core/models/teams/tab_entity_context.py | 0 .../agents/core/models/teams/tab_request.py | 0 .../agents/core/models/teams/tab_response.py | 0 .../core/models/teams/tab_response_card.py | 0 .../core/models/teams/tab_response_cards.py | 0 .../core/models/teams/tab_response_payload.py | 0 .../agents/core/models/teams/tab_submit.py | 0 .../core/models/teams/tab_submit_data.py | 0 .../models/teams/tab_suggested_actions.py | 0 .../teams/targeted_meeting_notification.py | 0 .../targeted_meeting_notification_value.py | 0 .../models/teams/task_module_card_response.py | 0 .../teams/task_module_continue_response.py | 0 .../teams/task_module_message_response.py | 0 .../core/models/teams/task_module_request.py | 0 .../teams/task_module_request_context.py | 0 .../core/models/teams/task_module_response.py | 0 .../models/teams/task_module_response_base.py | 0 .../models/teams/task_module_task_info.py | 0 .../agents/core/models/teams/team_details.py | 0 .../agents/core/models/teams/team_info.py | 0 .../teams/teams_batch_operation_response.py | 0 .../models/teams/teams_channel_account.py | 0 .../core/models/teams/teams_channel_data.py | 0 .../teams/teams_channel_data_settings.py | 0 .../core/models/teams/teams_meeting_info.py | 0 .../core/models/teams/teams_meeting_member.py | 0 .../models/teams/teams_meeting_participant.py | 0 .../agents/core/models/teams/teams_member.py | 0 .../teams/teams_paged_members_result.py | 0 .../agents/core/models/teams/tenant_info.py | 0 .../core/models/teams/user_meeting_details.py | 0 .../agents/core/models/text_format_types.py | 0 .../agents/core/models/text_highlight.py | 0 .../microsoft/agents/core/models/thing.py | 0 .../agents/core/models/thumbnail_card.py | 0 .../agents/core/models/thumbnail_url.py | 0 .../models/token_exchange_invoke_request.py | 0 .../models/token_exchange_invoke_response.py | 0 .../core/models/token_exchange_resource.py | 0 .../core/models/token_exchange_state.py | 0 .../agents/core/models/token_post_resource.py | 0 .../agents/core/models/token_request.py | 0 .../agents/core/models/token_response.py | 0 .../agents/core/models/token_status.py | 0 .../agents/core/models/transcript.py | 0 .../agents/core/models/video_card.py | 0 .../agents/core/turn_context_protocol.py | 0 .../microsoft-agents-core/pyproject.toml | 0 .../tests/test_activity_types.py | 0 .../agents/hosting/aiohttp/__init__.py | 0 .../hosting/aiohttp/_start_agent_process.py | 0 .../hosting/aiohttp/agent_http_adapter.py | 0 .../agents/hosting/aiohttp/app/__init__.py | 0 .../hosting/aiohttp/app/streaming/__init__.py | 0 .../hosting/aiohttp/app/streaming/citation.py | 0 .../aiohttp/app/streaming/citation_util.py | 0 .../app/streaming/streaming_response.py | 0 .../aiohttp/channel_service_route_table.py | 0 .../agents/hosting/aiohttp/cloud_adapter.py | 0 .../aiohttp/jwt_authorization_middleware.py | 0 .../pyproject.toml | 0 .../agents/hosting/teams/__init__.py | 0 .../hosting/teams/teams_activity_handler.py | 0 .../hosting/teams/teams_cloud_adapter.py | 0 .../agents/hosting/teams/teams_info.py | 0 .../pyproject.toml | 0 .../microsoft/agents/storage/__init__.py | 0 .../microsoft/agents/storage/_type_aliases.py | 0 .../agents/storage/memory_storage.py | 0 .../microsoft/agents/storage/storage.py | 0 .../microsoft/agents/storage/store_item.py | 0 .../microsoft-agents-storage/pyproject.toml | 0 314 files changed, 200 insertions(+), 200 deletions(-) rename libraries/{Authentication => }/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py (100%) rename libraries/{Authentication => }/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py (100%) rename libraries/{Authentication => }/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py (100%) rename libraries/{Authentication => }/microsoft-agents-authentication-msal/pyproject.toml (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/connections.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py (100%) rename libraries/{Core => }/microsoft-agents-authorization/pyproject.toml (100%) rename libraries/{Storage => }/microsoft-agents-blob/microsoft/agents/blob/__init__.py (97%) rename libraries/{Storage => }/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py (97%) rename libraries/{Storage => }/microsoft-agents-blob/pyproject.toml (96%) rename libraries/{Storage => }/microsoft-agents-blob/tests/test_blob_storage.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/__init__.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/agent.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/query.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/route.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/card_factory.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/message_factory.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/microsoft/agents/builder/turn_context.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/pyproject.toml (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/__init__.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/test_activity_handler.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/test_agent_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/test_state.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/test_turn_context.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/tools/testing_adapter.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/tools/testing_flow.py (100%) rename libraries/{Builder => }/microsoft-agents-builder/tests/tools/testing_utility.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/__init__.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/channel_protocol.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/channels_configuration.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/conversation_constants.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py (100%) rename libraries/{Client => }/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py (100%) rename libraries/{Client => }/microsoft-agents-client/pyproject.toml (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/__init__.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py (100%) rename libraries/{Client => }/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py (100%) rename libraries/{Client => }/microsoft-agents-connector/pyproject.toml (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/__init__.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/agent_type.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/connection_settings.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/direct_to_engine_connection_settings_protocol.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_cloud.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_environment.py (100%) rename libraries/{Client => }/microsoft-agents-copilotstudio-client/pyproject.toml (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/__init__.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/_load_configuration.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/__init__.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/action_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/activity.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/activity_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/agents_model.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/animation_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/attachment.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/audio_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/basic_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/card_action.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/card_image.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/channel_account.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/channels.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/entity.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/error.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/error_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/fact.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/hero_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/input_hints.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/media_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/media_url.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/mention.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/place.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/resource_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/role_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/signin_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/thing.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_request.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_response.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/token_status.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/transcript.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/models/video_card.py (100%) rename libraries/{Core => }/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py (100%) rename libraries/{Core => }/microsoft-agents-core/pyproject.toml (100%) rename libraries/{Core => }/microsoft-agents-core/tests/test_activity_types.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/__init__.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/__init__.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/__init__.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-aiohttp/pyproject.toml (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/__init__.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_cloud_adapter.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py (100%) rename libraries/{Hosting => }/microsoft-agents-hosting-teams/pyproject.toml (100%) rename libraries/{Storage => }/microsoft-agents-storage/microsoft/agents/storage/__init__.py (100%) rename libraries/{Storage => }/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py (100%) rename libraries/{Storage => }/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py (100%) rename libraries/{Storage => }/microsoft-agents-storage/microsoft/agents/storage/storage.py (100%) rename libraries/{Storage => }/microsoft-agents-storage/microsoft/agents/storage/store_item.py (100%) rename libraries/{Storage => }/microsoft-agents-storage/pyproject.toml (100%) diff --git a/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py similarity index 100% rename from libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py rename to libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py diff --git a/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py similarity index 100% rename from libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py rename to libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py diff --git a/libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py similarity index 100% rename from libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py rename to libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py diff --git a/libraries/Authentication/microsoft-agents-authentication-msal/pyproject.toml b/libraries/microsoft-agents-authentication-msal/pyproject.toml similarity index 100% rename from libraries/Authentication/microsoft-agents-authentication-msal/pyproject.toml rename to libraries/microsoft-agents-authentication-msal/pyproject.toml diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/connections.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/connections.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/connections.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/connections.py diff --git a/libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py b/libraries/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py similarity index 100% rename from libraries/Core/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py rename to libraries/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py diff --git a/libraries/Core/microsoft-agents-authorization/pyproject.toml b/libraries/microsoft-agents-authorization/pyproject.toml similarity index 100% rename from libraries/Core/microsoft-agents-authorization/pyproject.toml rename to libraries/microsoft-agents-authorization/pyproject.toml diff --git a/libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/__init__.py b/libraries/microsoft-agents-blob/microsoft/agents/blob/__init__.py similarity index 97% rename from libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/__init__.py rename to libraries/microsoft-agents-blob/microsoft/agents/blob/__init__.py index dec949a62..93ebbea86 100644 --- a/libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/__init__.py +++ b/libraries/microsoft-agents-blob/microsoft/agents/blob/__init__.py @@ -1,3 +1,3 @@ -from .blob_storage import BlobStorage, BlobStorageSettings - -__all__ = ["BlobStorage", "BlobStorageSettings"] +from .blob_storage import BlobStorage, BlobStorageSettings + +__all__ = ["BlobStorage", "BlobStorageSettings"] diff --git a/libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py b/libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py similarity index 97% rename from libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py rename to libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py index 1925b7e2b..6bfb1ff12 100644 --- a/libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py +++ b/libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py @@ -1,174 +1,174 @@ -# based on -# https://github.com/microsoft/botbuilder-python/blob/main/libraries/botbuilder-azure/botbuilder/azure/blob_storage.py - -from typing import TypeVar -from io import BytesIO -import json - -from azure.core.exceptions import ( - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, -) -from azure.storage.blob.aio import ( - ContainerClient, - BlobServiceClient, -) - -from microsoft.agents.storage._type_aliases import JSON -from microsoft.agents.storage import Storage, StoreItem - -StoreItemT = TypeVar("StoreItemT", bound=StoreItem) - - -class BlobStorageSettings: - - def __init__( - self, - container_name: str, - account_name: str = "", - account_key: str = "", - connection_string: str = "", - ): - self.container_name = container_name - self.account_name = account_name - self.account_key = account_key - self.connection_string = connection_string - - -def convert_account_name_and_key_to_connection_string(settings: BlobStorageSettings): - if not settings.account_name or not settings.account_key: - raise ValueError( - "account_name and account_key are both required for BlobStorageSettings if not using a connections string." - ) - return ( - f"DefaultEndpointsProtocol=https;AccountName={settings.account_name};" - f"AccountKey={settings.account_key};EndpointSuffix=core.windows.net" - ) - - -class BlobStorage(Storage): - - def __init__(self, settings: BlobStorageSettings): - if not settings.container_name: - raise ValueError("BlobStorage: Container name is required.") - - connection_string: str = settings.connection_string - if not connection_string: - # New Azure Blob SDK only allows connection strings, but our SDK allows key+name. - # This is here for backwards compatibility. - connection_string = convert_account_name_and_key_to_connection_string( - settings - ) - - blob_service_client: BlobServiceClient = ( - BlobServiceClient.from_connection_string(connection_string) - ) - - self._container_client: ContainerClient = ( - blob_service_client.get_container_client(settings.container_name) - ) - self._initialized: bool = False - - async def _initialize_container(self): - """Initializes the storage container""" - if self._initialized is False: - # This should only happen once - assuming this is a singleton. - # ContainerClient.exists() method is available in an unreleased version of the SDK. Until then, we use: - try: - await self._container_client.create_container() - except ResourceExistsError: - pass - self._initialized = True - - return self._initialized - - async def read( - self, keys: list[str], *, target_cls: StoreItemT = None, **kwargs - ) -> dict[str, StoreItemT]: - """Retrieve entities from the configured blob container. - - :param keys: An array of entity keys. - :type keys: dict[str, StoreItem] - :param target_cls: The StoreItem class to deserialize retrieved values into. - :type target_cls: StoreItem - :return dict: - """ - if not keys: - raise ValueError("BlobStorage.read(): Keys are required when reading.") - if not target_cls: - raise ValueError("BlobStorage.read(): target_cls cannot be None.") - - await self._initialize_container() - - result: dict[str, StoreItem] = {} - for key in keys: - - try: - item_rep: str = await ( - await self._container_client.download_blob(blob=key) - ).readall() - item_JSON: JSON = json.loads(item_rep) - except HttpResponseError as error: - if error.status_code == 404: - continue - else: - raise HttpResponseError( - f"BlobStorage.read(): Error reading blob '{key}': {error}" - ) - - try: - result[key] = target_cls.from_json_to_store_item(item_JSON) - except AttributeError as error: - raise TypeError( - f"BlobStorage.read(): could not deserialize blob item into {target_cls} class. Error: {error}" - ) - - return result - - async def write(self, changes: dict[str, StoreItem]): - """Stores a new entity in the configured blob container. - - :param changes: The changes to write to storage. - :type changes: dict[str, StoreItem] - :return: - """ - if not changes: - raise ValueError("BlobStorage.write(): changes cannot be None nor empty") - - await self._initialize_container() - - for key, item in changes.items(): - - item_JSON: JSON = item.store_item_to_json() - if item_JSON is None: - raise ValueError( - "BlobStorage.write(): StoreItem serialization cannot return None" - ) - item_rep_bytes = json.dumps(item_JSON).encode("utf-8") - - # providing the length parameter may improve performance - await self._container_client.upload_blob( - name=key, - data=BytesIO(item_rep_bytes), - overwrite=True, - length=len(item_rep_bytes), - ) - - async def delete(self, keys: list[str]): - """Deletes entity blobs from the configured container. - - :param keys: An array of entity keys. - :type keys: list[str] - """ - if keys is None: - raise ValueError("BlobStorage.delete(): keys parameter can't be null") - - await self._initialize_container() - - for key in keys: - try: - await self._container_client.delete_blob(blob=key) - # We can't delete what's already gone. - except ResourceNotFoundError: - pass +# based on +# https://github.com/microsoft/botbuilder-python/blob/main/libraries/botbuilder-azure/botbuilder/azure/blob_storage.py + +from typing import TypeVar +from io import BytesIO +import json + +from azure.core.exceptions import ( + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, +) +from azure.storage.blob.aio import ( + ContainerClient, + BlobServiceClient, +) + +from microsoft.agents.storage._type_aliases import JSON +from microsoft.agents.storage import Storage, StoreItem + +StoreItemT = TypeVar("StoreItemT", bound=StoreItem) + + +class BlobStorageSettings: + + def __init__( + self, + container_name: str, + account_name: str = "", + account_key: str = "", + connection_string: str = "", + ): + self.container_name = container_name + self.account_name = account_name + self.account_key = account_key + self.connection_string = connection_string + + +def convert_account_name_and_key_to_connection_string(settings: BlobStorageSettings): + if not settings.account_name or not settings.account_key: + raise ValueError( + "account_name and account_key are both required for BlobStorageSettings if not using a connections string." + ) + return ( + f"DefaultEndpointsProtocol=https;AccountName={settings.account_name};" + f"AccountKey={settings.account_key};EndpointSuffix=core.windows.net" + ) + + +class BlobStorage(Storage): + + def __init__(self, settings: BlobStorageSettings): + if not settings.container_name: + raise ValueError("BlobStorage: Container name is required.") + + connection_string: str = settings.connection_string + if not connection_string: + # New Azure Blob SDK only allows connection strings, but our SDK allows key+name. + # This is here for backwards compatibility. + connection_string = convert_account_name_and_key_to_connection_string( + settings + ) + + blob_service_client: BlobServiceClient = ( + BlobServiceClient.from_connection_string(connection_string) + ) + + self._container_client: ContainerClient = ( + blob_service_client.get_container_client(settings.container_name) + ) + self._initialized: bool = False + + async def _initialize_container(self): + """Initializes the storage container""" + if self._initialized is False: + # This should only happen once - assuming this is a singleton. + # ContainerClient.exists() method is available in an unreleased version of the SDK. Until then, we use: + try: + await self._container_client.create_container() + except ResourceExistsError: + pass + self._initialized = True + + return self._initialized + + async def read( + self, keys: list[str], *, target_cls: StoreItemT = None, **kwargs + ) -> dict[str, StoreItemT]: + """Retrieve entities from the configured blob container. + + :param keys: An array of entity keys. + :type keys: dict[str, StoreItem] + :param target_cls: The StoreItem class to deserialize retrieved values into. + :type target_cls: StoreItem + :return dict: + """ + if not keys: + raise ValueError("BlobStorage.read(): Keys are required when reading.") + if not target_cls: + raise ValueError("BlobStorage.read(): target_cls cannot be None.") + + await self._initialize_container() + + result: dict[str, StoreItem] = {} + for key in keys: + + try: + item_rep: str = await ( + await self._container_client.download_blob(blob=key) + ).readall() + item_JSON: JSON = json.loads(item_rep) + except HttpResponseError as error: + if error.status_code == 404: + continue + else: + raise HttpResponseError( + f"BlobStorage.read(): Error reading blob '{key}': {error}" + ) + + try: + result[key] = target_cls.from_json_to_store_item(item_JSON) + except AttributeError as error: + raise TypeError( + f"BlobStorage.read(): could not deserialize blob item into {target_cls} class. Error: {error}" + ) + + return result + + async def write(self, changes: dict[str, StoreItem]): + """Stores a new entity in the configured blob container. + + :param changes: The changes to write to storage. + :type changes: dict[str, StoreItem] + :return: + """ + if not changes: + raise ValueError("BlobStorage.write(): changes cannot be None nor empty") + + await self._initialize_container() + + for key, item in changes.items(): + + item_JSON: JSON = item.store_item_to_json() + if item_JSON is None: + raise ValueError( + "BlobStorage.write(): StoreItem serialization cannot return None" + ) + item_rep_bytes = json.dumps(item_JSON).encode("utf-8") + + # providing the length parameter may improve performance + await self._container_client.upload_blob( + name=key, + data=BytesIO(item_rep_bytes), + overwrite=True, + length=len(item_rep_bytes), + ) + + async def delete(self, keys: list[str]): + """Deletes entity blobs from the configured container. + + :param keys: An array of entity keys. + :type keys: list[str] + """ + if keys is None: + raise ValueError("BlobStorage.delete(): keys parameter can't be null") + + await self._initialize_container() + + for key in keys: + try: + await self._container_client.delete_blob(blob=key) + # We can't delete what's already gone. + except ResourceNotFoundError: + pass diff --git a/libraries/Storage/microsoft-agents-blob/pyproject.toml b/libraries/microsoft-agents-blob/pyproject.toml similarity index 96% rename from libraries/Storage/microsoft-agents-blob/pyproject.toml rename to libraries/microsoft-agents-blob/pyproject.toml index 7fd16cb6a..d30abf71d 100644 --- a/libraries/Storage/microsoft-agents-blob/pyproject.toml +++ b/libraries/microsoft-agents-blob/pyproject.toml @@ -1,23 +1,23 @@ -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" - -[project] -name = "microsoft-agents-blob" -version = "0.0.0a1" -description = "A blob storage library for Microsoft Agents" -authors = [{name = "Microsoft Corporation"}] -requires-python = ">=3.9" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", -] -dependencies = [ - "microsoft.agents.storage", - "azure-core", - "azure-storage-blob", -] - -[project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "microsoft-agents-blob" +version = "0.0.0a1" +description = "A blob storage library for Microsoft Agents" +authors = [{name = "Microsoft Corporation"}] +requires-python = ">=3.9" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", +] +dependencies = [ + "microsoft.agents.storage", + "azure-core", + "azure-storage-blob", +] + +[project.urls] +"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" diff --git a/libraries/Storage/microsoft-agents-blob/tests/test_blob_storage.py b/libraries/microsoft-agents-blob/tests/test_blob_storage.py similarity index 100% rename from libraries/Storage/microsoft-agents-blob/tests/test_blob_storage.py rename to libraries/microsoft-agents-blob/tests/test_blob_storage.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/__init__.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/__init__.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/__init__.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/__init__.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/agent.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/agent.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/agent.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/agent.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/query.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/query.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/query.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/query.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/route.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/route.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/route.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/route.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/card_factory.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/card_factory.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/card_factory.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/card_factory.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/message_factory.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/message_factory.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/message_factory.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/message_factory.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py diff --git a/libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/turn_context.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/turn_context.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/turn_context.py rename to libraries/microsoft-agents-builder/microsoft/agents/builder/turn_context.py diff --git a/libraries/Builder/microsoft-agents-builder/pyproject.toml b/libraries/microsoft-agents-builder/pyproject.toml similarity index 100% rename from libraries/Builder/microsoft-agents-builder/pyproject.toml rename to libraries/microsoft-agents-builder/pyproject.toml diff --git a/libraries/Builder/microsoft-agents-builder/tests/__init__.py b/libraries/microsoft-agents-builder/tests/__init__.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/__init__.py rename to libraries/microsoft-agents-builder/tests/__init__.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/test_activity_handler.py b/libraries/microsoft-agents-builder/tests/test_activity_handler.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/test_activity_handler.py rename to libraries/microsoft-agents-builder/tests/test_activity_handler.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/test_agent_state.py b/libraries/microsoft-agents-builder/tests/test_agent_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/test_agent_state.py rename to libraries/microsoft-agents-builder/tests/test_agent_state.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/test_state.py b/libraries/microsoft-agents-builder/tests/test_state.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/test_state.py rename to libraries/microsoft-agents-builder/tests/test_state.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/test_turn_context.py b/libraries/microsoft-agents-builder/tests/test_turn_context.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/test_turn_context.py rename to libraries/microsoft-agents-builder/tests/test_turn_context.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/tools/testing_adapter.py b/libraries/microsoft-agents-builder/tests/tools/testing_adapter.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/tools/testing_adapter.py rename to libraries/microsoft-agents-builder/tests/tools/testing_adapter.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/tools/testing_flow.py b/libraries/microsoft-agents-builder/tests/tools/testing_flow.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/tools/testing_flow.py rename to libraries/microsoft-agents-builder/tests/tools/testing_flow.py diff --git a/libraries/Builder/microsoft-agents-builder/tests/tools/testing_utility.py b/libraries/microsoft-agents-builder/tests/tools/testing_utility.py similarity index 100% rename from libraries/Builder/microsoft-agents-builder/tests/tools/testing_utility.py rename to libraries/microsoft-agents-builder/tests/tools/testing_utility.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/__init__.py b/libraries/microsoft-agents-client/microsoft/agents/client/__init__.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/__init__.py rename to libraries/microsoft-agents-client/microsoft/agents/client/__init__.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py b/libraries/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py rename to libraries/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py b/libraries/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py rename to libraries/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py b/libraries/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py rename to libraries/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py b/libraries/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py rename to libraries/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_protocol.py b/libraries/microsoft-agents-client/microsoft/agents/client/channel_protocol.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/channel_protocol.py rename to libraries/microsoft-agents-client/microsoft/agents/client/channel_protocol.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/channels_configuration.py b/libraries/microsoft-agents-client/microsoft/agents/client/channels_configuration.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/channels_configuration.py rename to libraries/microsoft-agents-client/microsoft/agents/client/channels_configuration.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py b/libraries/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py rename to libraries/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_constants.py b/libraries/microsoft-agents-client/microsoft/agents/client/conversation_constants.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_constants.py rename to libraries/microsoft-agents-client/microsoft/agents/client/conversation_constants.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py b/libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py rename to libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py b/libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py rename to libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py b/libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py rename to libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py b/libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py rename to libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py diff --git a/libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py b/libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py similarity index 100% rename from libraries/Client/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py rename to libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py diff --git a/libraries/Client/microsoft-agents-client/pyproject.toml b/libraries/microsoft-agents-client/pyproject.toml similarity index 100% rename from libraries/Client/microsoft-agents-client/pyproject.toml rename to libraries/microsoft-agents-client/pyproject.toml diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/__init__.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/__init__.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/__init__.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/__init__.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py diff --git a/libraries/Client/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py b/libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py similarity index 100% rename from libraries/Client/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py rename to libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py diff --git a/libraries/Client/microsoft-agents-connector/pyproject.toml b/libraries/microsoft-agents-connector/pyproject.toml similarity index 100% rename from libraries/Client/microsoft-agents-connector/pyproject.toml rename to libraries/microsoft-agents-connector/pyproject.toml diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/__init__.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/__init__.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/__init__.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/__init__.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/agent_type.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/agent_type.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/agent_type.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/agent_type.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/connection_settings.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/connection_settings.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/connection_settings.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/connection_settings.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/direct_to_engine_connection_settings_protocol.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/direct_to_engine_connection_settings_protocol.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/direct_to_engine_connection_settings_protocol.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/direct_to_engine_connection_settings_protocol.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_cloud.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_cloud.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_cloud.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_cloud.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_environment.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_environment.py similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_environment.py rename to libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/power_platform_environment.py diff --git a/libraries/Client/microsoft-agents-copilotstudio-client/pyproject.toml b/libraries/microsoft-agents-copilotstudio-client/pyproject.toml similarity index 100% rename from libraries/Client/microsoft-agents-copilotstudio-client/pyproject.toml rename to libraries/microsoft-agents-copilotstudio-client/pyproject.toml diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/__init__.py b/libraries/microsoft-agents-core/microsoft/agents/core/__init__.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/__init__.py rename to libraries/microsoft-agents-core/microsoft/agents/core/__init__.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/_load_configuration.py b/libraries/microsoft-agents-core/microsoft/agents/core/_load_configuration.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/_load_configuration.py rename to libraries/microsoft-agents-core/microsoft/agents/core/_load_configuration.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py b/libraries/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py rename to libraries/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/__init__.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/__init__.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/__init__.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/__init__.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/action_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/action_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/action_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/action_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/activity.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/activity.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/activity_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/activity_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/activity_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/agents_model.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/agents_model.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/agents_model.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/agents_model.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/animation_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/animation_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/animation_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/animation_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/attachment.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/audio_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/audio_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/audio_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/audio_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/basic_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/basic_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/basic_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/basic_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/card_action.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/card_action.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/card_action.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/card_action.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/card_image.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/card_image.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/card_image.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/card_image.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/channel_account.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/channel_account.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/channel_account.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/channel_account.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/channels.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/channels.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/channels.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/channels.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/entity.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/entity.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/entity.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/entity.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/error.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/error.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/error.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/error.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/error_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/error_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/error_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/error_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/fact.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/fact.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/fact.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/fact.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/hero_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/hero_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/hero_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/hero_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/input_hints.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/input_hints.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/input_hints.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/input_hints.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/media_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/media_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/media_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/media_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/media_url.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/media_url.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/media_url.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/media_url.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/mention.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/mention.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/mention.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/mention.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/place.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/place.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/place.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/place.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/resource_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/resource_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/resource_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/resource_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/role_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/role_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/role_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/role_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/signin_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/signin_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/signin_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/signin_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/thing.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/thing.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/thing.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/thing.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_request.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_request.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_request.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_request.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_response.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_response.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_response.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_response.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_status.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/token_status.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/token_status.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/token_status.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/transcript.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/transcript.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/transcript.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/transcript.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/models/video_card.py b/libraries/microsoft-agents-core/microsoft/agents/core/models/video_card.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/models/video_card.py rename to libraries/microsoft-agents-core/microsoft/agents/core/models/video_card.py diff --git a/libraries/Core/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py b/libraries/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py similarity index 100% rename from libraries/Core/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py rename to libraries/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py diff --git a/libraries/Core/microsoft-agents-core/pyproject.toml b/libraries/microsoft-agents-core/pyproject.toml similarity index 100% rename from libraries/Core/microsoft-agents-core/pyproject.toml rename to libraries/microsoft-agents-core/pyproject.toml diff --git a/libraries/Core/microsoft-agents-core/tests/test_activity_types.py b/libraries/microsoft-agents-core/tests/test_activity_types.py similarity index 100% rename from libraries/Core/microsoft-agents-core/tests/test_activity_types.py rename to libraries/microsoft-agents-core/tests/test_activity_types.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/__init__.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/__init__.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/__init__.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/__init__.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/__init__.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/__init__.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/__init__.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/__init__.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/__init__.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/__init__.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/__init__.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/__init__.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py rename to libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py diff --git a/libraries/Hosting/microsoft-agents-hosting-aiohttp/pyproject.toml b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-aiohttp/pyproject.toml rename to libraries/microsoft-agents-hosting-aiohttp/pyproject.toml diff --git a/libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/__init__.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/__init__.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/__init__.py rename to libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/__init__.py diff --git a/libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py rename to libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py diff --git a/libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_cloud_adapter.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_cloud_adapter.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_cloud_adapter.py rename to libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_cloud_adapter.py diff --git a/libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py rename to libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py diff --git a/libraries/Hosting/microsoft-agents-hosting-teams/pyproject.toml b/libraries/microsoft-agents-hosting-teams/pyproject.toml similarity index 100% rename from libraries/Hosting/microsoft-agents-hosting-teams/pyproject.toml rename to libraries/microsoft-agents-hosting-teams/pyproject.toml diff --git a/libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/__init__.py b/libraries/microsoft-agents-storage/microsoft/agents/storage/__init__.py similarity index 100% rename from libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/__init__.py rename to libraries/microsoft-agents-storage/microsoft/agents/storage/__init__.py diff --git a/libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py b/libraries/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py similarity index 100% rename from libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py rename to libraries/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py diff --git a/libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py b/libraries/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py similarity index 100% rename from libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py rename to libraries/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py diff --git a/libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/storage.py b/libraries/microsoft-agents-storage/microsoft/agents/storage/storage.py similarity index 100% rename from libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/storage.py rename to libraries/microsoft-agents-storage/microsoft/agents/storage/storage.py diff --git a/libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/store_item.py b/libraries/microsoft-agents-storage/microsoft/agents/storage/store_item.py similarity index 100% rename from libraries/Storage/microsoft-agents-storage/microsoft/agents/storage/store_item.py rename to libraries/microsoft-agents-storage/microsoft/agents/storage/store_item.py diff --git a/libraries/Storage/microsoft-agents-storage/pyproject.toml b/libraries/microsoft-agents-storage/pyproject.toml similarity index 100% rename from libraries/Storage/microsoft-agents-storage/pyproject.toml rename to libraries/microsoft-agents-storage/pyproject.toml From f0796c6531e01f1ab878e337c9af2a70e4a77d41 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Fri, 18 Jul 2025 16:06:56 -0700 Subject: [PATCH 02/10] consolidating libraries and renaming --- .../microsoft}/__init__.py | 0 .../microsoft/agents/__init__.py | 0 .../microsoft/agents/activity}/__init__.py | 8 +++++ .../agents/activity}/_load_configuration.py | 0 .../agents/activity}/_type_aliases.py | 0 .../agents/activity}/action_types.py | 0 .../microsoft/agents/activity}/activity.py | 0 .../agents/activity}/activity_event_names.py | 0 .../agents/activity}/activity_importance.py | 0 .../agents/activity}/activity_types.py | 0 .../activity}/adaptive_card_invoke_action.py | 0 .../adaptive_card_invoke_response.py | 0 .../activity}/adaptive_card_invoke_value.py | 4 +-- .../agents/activity}/agents_model.py | 0 .../microsoft/agents/activity}/ai_entity.py | 0 .../agents/activity}/animation_card.py | 0 .../microsoft/agents/activity}/attachment.py | 0 .../agents/activity}/attachment_data.py | 0 .../agents/activity}/attachment_info.py | 0 .../activity}/attachment_layout_types.py | 0 .../agents/activity}/attachment_view.py | 0 .../microsoft/agents/activity}/audio_card.py | 0 .../microsoft/agents/activity}/basic_card.py | 0 .../agents/activity}/caller_id_constants.py | 0 .../microsoft/agents/activity}/card_action.py | 0 .../microsoft/agents/activity}/card_image.py | 0 .../agents/activity}/channel_account.py | 0 .../activity}/channel_adapter_protocol.py | 2 +- .../microsoft/agents/activity}/channels.py | 0 .../contact_relation_update_action_types.py | 0 .../agents/activity}/conversation_account.py | 0 .../agents/activity}/conversation_members.py | 0 .../activity}/conversation_parameters.py | 0 .../activity}/conversation_reference.py | 0 .../conversation_resource_response.py | 0 .../activity}/conversation_update_types.py | 0 .../agents/activity}/conversations_result.py | 0 .../agents/activity}/delivery_modes.py | 0 .../activity}/end_of_conversation_codes.py | 0 .../microsoft/agents/activity}/entity.py | 0 .../microsoft/agents/activity}/error.py | 0 .../agents/activity}/error_response.py | 0 .../agents/activity}/expected_replies.py | 0 .../microsoft/agents/activity}/fact.py | 0 .../agents/activity}/geo_coordinates.py | 0 .../microsoft/agents/activity}/hero_card.py | 0 .../agents/activity}/inner_http_error.py | 0 .../microsoft/agents/activity}/input_hints.py | 0 .../installation_update_action_types.py | 0 .../agents/activity}/invoke_response.py | 0 .../microsoft/agents/activity}/media_card.py | 0 .../agents/activity}/media_event_value.py | 0 .../microsoft/agents/activity}/media_url.py | 0 .../microsoft/agents/activity}/mention.py | 0 .../agents/activity}/message_reaction.py | 0 .../activity}/message_reaction_types.py | 0 .../agents/activity}/message_update_types.py | 0 .../microsoft/agents/activity}/oauth_card.py | 0 .../agents/activity}/paged_members_result.py | 0 .../microsoft/agents/activity}/place.py | 0 .../agents/activity}/receipt_card.py | 0 .../agents/activity}/receipt_item.py | 0 .../agents/activity}/resource_response.py | 0 .../microsoft/agents/activity}/role_types.py | 0 .../agents/activity}/semantic_action.py | 0 .../activity}/semantic_actions_states.py | 0 .../agents/activity}/sign_in_constants.py | 0 .../agents/activity}/sign_in_resource.py | 0 .../microsoft/agents/activity}/signin_card.py | 0 .../agents/activity}/suggested_actions.py | 0 .../agents/activity}/teams/__init__.py | 0 .../activity}/teams/app_based_link_query.py | 0 .../teams/batch_failed_entries_response.py | 0 .../activity}/teams/batch_failed_entry.py | 0 .../teams/batch_operation_response.py | 0 .../teams/batch_operation_state_response.py | 0 .../agents/activity}/teams/bot_config_auth.py | 0 .../agents/activity}/teams/cache_info.py | 0 .../teams/cancel_operation_response.py | 0 .../agents/activity}/teams/channel_info.py | 0 .../activity}/teams/config_auth_response.py | 0 .../agents/activity}/teams/config_response.py | 0 .../activity}/teams/config_response_base.py | 0 .../activity}/teams/config_task_response.py | 0 .../activity}/teams/conversation_list.py | 0 .../activity}/teams/file_consent_card.py | 0 .../teams/file_consent_card_response.py | 0 .../activity}/teams/file_download_info.py | 0 .../agents/activity}/teams/file_info_card.py | 0 .../activity}/teams/file_upload_info.py | 0 .../agents/activity}/teams/meeting_details.py | 0 .../activity}/teams/meeting_details_base.py | 0 .../teams/meeting_end_event_details.py | 0 .../activity}/teams/meeting_event_details.py | 0 .../agents/activity}/teams/meeting_info.py | 0 .../activity}/teams/meeting_notification.py | 0 .../teams/meeting_notification_base.py | 0 .../meeting_notification_channel_data.py | 0 ...ing_notification_recipient_failure_info.py | 0 .../teams/meeting_notification_response.py | 0 .../teams/meeting_participant_info.py | 0 .../meeting_participants_event_details.py | 0 .../activity}/teams/meeting_stage_surface.py | 0 .../teams/meeting_start_event_details.py | 0 .../teams/meeting_tab_icon_surface.py | 0 .../teams/message_actions_payload.py | 0 .../teams/message_actions_payload_app.py | 0 .../message_actions_payload_attachment.py | 0 .../teams/message_actions_payload_body.py | 0 .../message_actions_payload_conversation.py | 0 .../teams/message_actions_payload_from.py | 0 .../teams/message_actions_payload_mention.py | 0 .../teams/message_actions_payload_reaction.py | 0 .../teams/message_actions_payload_user.py | 0 .../teams/messaging_extension_action.py | 0 .../messaging_extension_action_response.py | 0 .../teams/messaging_extension_attachment.py | 0 .../teams/messaging_extension_parameter.py | 0 .../teams/messaging_extension_query.py | 0 .../messaging_extension_query_options.py | 0 .../teams/messaging_extension_response.py | 0 .../teams/messaging_extension_result.py | 0 .../messaging_extension_suggested_action.py | 0 .../activity}/teams/notification_info.py | 0 .../activity}/teams/o365_connector_card.py | 0 .../teams/o365_connector_card_action_base.py | 0 .../teams/o365_connector_card_action_card.py | 0 .../teams/o365_connector_card_action_query.py | 0 .../teams/o365_connector_card_date_input.py | 0 .../teams/o365_connector_card_fact.py | 0 .../teams/o365_connector_card_http_post.py | 0 .../teams/o365_connector_card_image.py | 0 .../teams/o365_connector_card_input_base.py | 0 .../o365_connector_card_multichoice_input.py | 0 ...connector_card_multichoice_input_choice.py | 0 .../teams/o365_connector_card_open_uri.py | 0 .../o365_connector_card_open_uri_target.py | 0 .../teams/o365_connector_card_section.py | 0 .../teams/o365_connector_card_text_input.py | 0 .../teams/o365_connector_card_view_action.py | 0 .../agents/activity}/teams/on_behalf_of.py | 0 .../activity}/teams/read_receipt_info.py | 0 .../teams/signin_state_verification_query.py | 0 .../agents/activity}/teams/surface.py | 0 .../agents/activity}/teams/tab_context.py | 0 .../activity}/teams/tab_entity_context.py | 0 .../agents/activity}/teams/tab_request.py | 0 .../agents/activity}/teams/tab_response.py | 0 .../activity}/teams/tab_response_card.py | 0 .../activity}/teams/tab_response_cards.py | 0 .../activity}/teams/tab_response_payload.py | 0 .../agents/activity}/teams/tab_submit.py | 0 .../agents/activity}/teams/tab_submit_data.py | 0 .../activity}/teams/tab_suggested_actions.py | 0 .../teams/targeted_meeting_notification.py | 0 .../targeted_meeting_notification_value.py | 0 .../teams/task_module_card_response.py | 0 .../teams/task_module_continue_response.py | 0 .../teams/task_module_message_response.py | 0 .../activity}/teams/task_module_request.py | 0 .../teams/task_module_request_context.py | 0 .../activity}/teams/task_module_response.py | 0 .../teams/task_module_response_base.py | 0 .../activity}/teams/task_module_task_info.py | 0 .../agents/activity}/teams/team_details.py | 0 .../agents/activity}/teams/team_info.py | 0 .../teams/teams_batch_operation_response.py | 0 .../activity}/teams/teams_channel_account.py | 0 .../activity}/teams/teams_channel_data.py | 0 .../teams/teams_channel_data_settings.py | 0 .../activity}/teams/teams_meeting_info.py | 0 .../activity}/teams/teams_meeting_member.py | 0 .../teams/teams_meeting_participant.py | 0 .../agents/activity}/teams/teams_member.py | 0 .../teams/teams_paged_members_result.py | 0 .../agents/activity}/teams/tenant_info.py | 0 .../activity}/teams/user_meeting_details.py | 0 .../agents/activity}/text_format_types.py | 0 .../agents/activity}/text_highlight.py | 0 .../microsoft/agents/activity}/thing.py | 0 .../agents/activity}/thumbnail_card.py | 0 .../agents/activity}/thumbnail_url.py | 0 .../token_exchange_invoke_request.py | 0 .../token_exchange_invoke_response.py | 0 .../activity}/token_exchange_resource.py | 0 .../agents/activity}/token_exchange_state.py | 0 .../agents/activity}/token_post_resource.py | 0 .../agents/activity}/token_request.py | 0 .../agents/activity}/token_response.py | 0 .../agents/activity}/token_status.py | 0 .../microsoft/agents/activity}/transcript.py | 0 .../agents/activity}/turn_context_protocol.py | 0 .../microsoft/agents/activity}/video_card.py | 0 .../pyproject.toml | 0 .../tests/test_activity_types.py | 0 .../agents/authentication/msal/msal_auth.py | 4 +-- .../msal/msal_connection_manager.py | 2 +- .../pyproject.toml | 21 -------------- .../microsoft/agents/builder/__init__.py | 29 ------------------- .../microsoft-agents-client/pyproject.toml | 22 -------------- .../microsoft-agents-connector/pyproject.toml | 24 --------------- .../microsoft/agents/core/__init__.py | 9 ------ .../hosting/aiohttp/_start_agent_process.py | 2 +- .../hosting/aiohttp/agent_http_adapter.py | 2 +- .../app/streaming/streaming_response.py | 2 +- .../aiohttp/channel_service_route_table.py | 2 +- .../agents/hosting/aiohttp/cloud_adapter.py | 5 ++-- .../aiohttp/jwt_authorization_middleware.py | 2 +- .../pyproject.toml | 2 +- .../microsoft/agents/hosting/core/__init__.py | 0 .../agents/hosting/core}/activity_handler.py | 4 +-- .../microsoft/agents/hosting/core}/agent.py | 0 .../agents/hosting/core}/app/__init__.py | 0 .../hosting/core}/app/agent_application.py | 7 ++--- .../agents/hosting/core}/app/app_error.py | 0 .../agents/hosting/core}/app/app_options.py | 2 +- .../agents/hosting/core}/app/input_file.py | 2 +- .../hosting/core}/app/oauth/__init__.py | 0 .../hosting/core}/app/oauth/authorization.py | 2 +- .../agents/hosting/core}/app/query.py | 0 .../agents/hosting/core}/app/route.py | 2 +- .../hosting/core}/app/state/__init__.py | 0 .../core}/app/state/conversation_state.py | 4 +-- .../agents/hosting/core}/app/state/state.py | 4 +-- .../hosting/core}/app/state/temp_state.py | 6 ++-- .../hosting/core}/app/state/turn_state.py | 10 +++---- .../hosting/core}/app/typing_indicator.py | 2 +- .../hosting/core}/authorization/__init__.py | 0 .../access_token_provider_base.py | 0 .../authorization/agent_auth_configuration.py | 2 +- .../authorization/anonymous_token_provider.py | 0 .../hosting/core}/authorization/auth_types.py | 0 .../authorization/authentication_constants.py | 0 .../core}/authorization/claims_identity.py | 0 .../core}/authorization/connections.py | 0 .../authorization/jwt_token_validator.py | 0 .../agents/hosting/core}/card_factory.py | 0 .../agents/hosting/core}/channel_adapter.py | 12 ++++---- .../core}/channel_api_handler_protocol.py | 2 +- .../hosting/core}/channel_service_adapter.py | 6 ++-- .../channel_service_client_factory_base.py | 4 +-- .../agents/hosting/core}/client/__init__.py | 0 .../client/agent_conversation_reference.py | 0 .../core}/client/channel_factory_protocol.py | 2 +- .../core}/client/channel_host_protocol.py | 0 .../core}/client/channel_info_protocol.py | 0 .../hosting/core}/client/channel_protocol.py | 0 .../core}/client/channels_configuration.py | 0 .../client/configuration_channel_host.py | 2 +- .../core}/client/conversation_constants.py | 0 .../core}/client/conversation_id_factory.py | 0 .../client/conversation_id_factory_options.py | 0 .../conversation_id_factory_protocol.py | 0 .../core}/client/http_agent_channel.py | 2 +- .../client/http_agent_channel_factory.py | 2 +- .../hosting/core}/connector/__init__.py | 0 .../core}/connector/agent_sign_in_base.py | 0 .../core}/connector/attachments_base.py | 0 .../core}/connector/client/__init__.py | 0 .../connector/client/connector_client.py | 3 +- .../connector/client/user_token_client.py | 2 +- .../core}/connector/connector_client_base.py | 0 .../core}/connector/conversations_base.py | 0 .../core}/connector/get_product_info.py | 0 .../hosting/core}/connector/teams/__init__.py | 0 .../connector/teams/teams_connector_client.py | 6 ++-- .../core}/connector/user_token_base.py | 0 .../core}/connector/user_token_client_base.py | 0 .../agents/hosting/core}/message_factory.py | 0 .../agents/hosting/core}/middleware_set.py | 0 .../agents/hosting/core}/oauth_flow.py | 4 +-- .../rest_channel_service_client_factory.py | 12 ++++---- .../agents/hosting/core}/state/__init__.py | 0 .../agents/hosting/core}/state/agent_state.py | 2 +- .../core}/state/state_property_accessor.py | 0 .../agents/hosting/core}/state/user_state.py | 0 .../agents/hosting/core}/storage/__init__.py | 0 .../hosting/core}/storage/_type_aliases.py | 0 .../hosting/core}/storage/error_handling.py | 0 .../hosting/core}/storage/memory_storage.py | 0 .../agents/hosting/core}/storage/storage.py | 0 .../core}/storage/storage_test_utils.py | 0 .../hosting/core}/storage/store_item.py | 0 .../agents/hosting/core}/turn_context.py | 0 .../pyproject.toml | 6 ++-- .../tests/__init__.py | 0 .../tests/test_activity_handler.py | 2 +- .../tests/test_agent_state.py | 8 ++--- .../tests/test_error_handling.py | 0 .../tests/test_memory_storage.py | 0 .../tests/test_state.py | 4 +-- .../tests/test_turn_context.py | 2 +- .../tests/test_utils.py | 0 .../tests/tools/testing_adapter.py | 13 ++++----- .../tests/tools/testing_flow.py | 0 .../tests/tools/testing_utility.py | 2 +- .../hosting/teams/teams_activity_handler.py | 4 +-- .../agents/hosting/teams/teams_info.py | 6 ++-- .../pyproject.toml | 2 +- .../microsoft/agents/blob/__init__.py | 0 .../microsoft/agents/blob/blob_storage.py | 0 .../agents/blob/blob_storage_config.py | 0 .../pyproject.toml | 0 .../tests/test_blob_storage.py | 0 .../microsoft-agents-storage/pyproject.toml | 20 ------------- test_samples/README.md | 8 ++--- test_samples/agent_to_agent/agent_1/agent1.py | 6 ++-- test_samples/agent_to_agent/agent_1/app.py | 6 ++-- test_samples/agent_to_agent/agent_1/config.py | 2 +- test_samples/agent_to_agent/agent_2/agent2.py | 2 +- test_samples/agent_to_agent/agent_2/app.py | 4 +-- test_samples/app_style/authorization_agent.py | 6 ++-- test_samples/app_style/emtpy_agent.py | 6 ++-- test_samples/app_style/mcs_agent.py | 6 ++-- test_samples/app_style/shared/start_server.py | 5 ++-- test_samples/app_style/streaming_agent.py | 6 ++-- test_samples/empty_agent/app.py | 4 +-- test_samples/empty_agent/empty_agent.py | 2 +- test_samples/teams_agent/app.py | 9 +++--- .../helpers/task_module_response_factory.py | 2 +- test_samples/teams_agent/teams_handler.py | 4 +-- .../teams_agent/teams_multi_feature.py | 4 +-- test_samples/teams_agent/teams_sso.py | 4 +-- test_samples/weather-agent-open-ai/app.py | 6 ++-- .../weather-agent-open-ai/weather_agent.py | 2 +- 325 files changed, 142 insertions(+), 271 deletions(-) rename libraries/{microsoft-agents-builder/tests => microsoft-agents-activity/microsoft}/__init__.py (100%) create mode 100644 libraries/microsoft-agents-activity/microsoft/agents/__init__.py rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/__init__.py (95%) rename libraries/{microsoft-agents-core/microsoft/agents/core => microsoft-agents-activity/microsoft/agents/activity}/_load_configuration.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/_type_aliases.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/action_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/activity.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/activity_event_names.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/activity_importance.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/activity_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/adaptive_card_invoke_action.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/adaptive_card_invoke_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/adaptive_card_invoke_value.py (81%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/agents_model.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/ai_entity.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/animation_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/attachment.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/attachment_data.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/attachment_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/attachment_layout_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/attachment_view.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/audio_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/basic_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/caller_id_constants.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/card_action.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/card_image.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/channel_account.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core => microsoft-agents-activity/microsoft/agents/activity}/channel_adapter_protocol.py (97%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/channels.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/contact_relation_update_action_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversation_account.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversation_members.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversation_parameters.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversation_reference.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversation_resource_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversation_update_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/conversations_result.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/delivery_modes.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/end_of_conversation_codes.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/entity.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/error.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/error_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/expected_replies.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/fact.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/geo_coordinates.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/hero_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/inner_http_error.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/input_hints.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/installation_update_action_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/invoke_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/media_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/media_event_value.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/media_url.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/mention.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/message_reaction.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/message_reaction_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/message_update_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/oauth_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/paged_members_result.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/place.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/receipt_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/receipt_item.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/resource_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/role_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/semantic_action.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/semantic_actions_states.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/sign_in_constants.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/sign_in_resource.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/signin_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/suggested_actions.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/__init__.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/app_based_link_query.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/batch_failed_entries_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/batch_failed_entry.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/batch_operation_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/batch_operation_state_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/bot_config_auth.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/cache_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/cancel_operation_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/channel_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/config_auth_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/config_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/config_response_base.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/config_task_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/conversation_list.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/file_consent_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/file_consent_card_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/file_download_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/file_info_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/file_upload_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_details_base.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_end_event_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_event_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_notification.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_notification_base.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_notification_channel_data.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_notification_recipient_failure_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_notification_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_participant_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_participants_event_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_stage_surface.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_start_event_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/meeting_tab_icon_surface.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_app.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_attachment.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_body.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_conversation.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_from.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_mention.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_reaction.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/message_actions_payload_user.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_action.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_action_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_attachment.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_parameter.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_query.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_query_options.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_result.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/messaging_extension_suggested_action.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/notification_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_action_base.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_action_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_action_query.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_date_input.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_fact.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_http_post.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_image.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_input_base.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_multichoice_input.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_multichoice_input_choice.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_open_uri.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_open_uri_target.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_section.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_text_input.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/o365_connector_card_view_action.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/on_behalf_of.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/read_receipt_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/signin_state_verification_query.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/surface.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_context.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_entity_context.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_request.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_response_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_response_cards.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_response_payload.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_submit.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_submit_data.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tab_suggested_actions.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/targeted_meeting_notification.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/targeted_meeting_notification_value.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_card_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_continue_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_message_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_request.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_request_context.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_response_base.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/task_module_task_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/team_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/team_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_batch_operation_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_channel_account.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_channel_data.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_channel_data_settings.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_meeting_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_meeting_member.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_meeting_participant.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_member.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/teams_paged_members_result.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/tenant_info.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/teams/user_meeting_details.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/text_format_types.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/text_highlight.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/thing.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/thumbnail_card.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/thumbnail_url.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_exchange_invoke_request.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_exchange_invoke_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_exchange_resource.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_exchange_state.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_post_resource.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_request.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_response.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/token_status.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/transcript.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core => microsoft-agents-activity/microsoft/agents/activity}/turn_context_protocol.py (100%) rename libraries/{microsoft-agents-core/microsoft/agents/core/models => microsoft-agents-activity/microsoft/agents/activity}/video_card.py (100%) rename libraries/{microsoft-agents-core => microsoft-agents-activity}/pyproject.toml (100%) rename libraries/{microsoft-agents-core => microsoft-agents-activity}/tests/test_activity_types.py (100%) delete mode 100644 libraries/microsoft-agents-authorization/pyproject.toml delete mode 100644 libraries/microsoft-agents-builder/microsoft/agents/builder/__init__.py delete mode 100644 libraries/microsoft-agents-client/pyproject.toml delete mode 100644 libraries/microsoft-agents-connector/pyproject.toml delete mode 100644 libraries/microsoft-agents-core/microsoft/agents/core/__init__.py create mode 100644 libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/activity_handler.py (99%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/agent.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/__init__.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/agent_application.py (99%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/app_error.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/app_options.py (97%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/input_file.py (95%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/oauth/__init__.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/oauth/authorization.py (99%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/query.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/route.py (94%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/state/__init__.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/state/conversation_state.py (91%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/state/state.py (97%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/state/temp_state.py (94%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/state/turn_state.py (96%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/app/typing_indicator.py (96%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/__init__.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/access_token_provider_base.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/agent_auth_configuration.py (96%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/anonymous_token_provider.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/auth_types.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/authentication_constants.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/claims_identity.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/connections.py (100%) rename libraries/{microsoft-agents-authorization/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/authorization/jwt_token_validator.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/card_factory.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/channel_adapter.py (96%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/channel_api_handler_protocol.py (98%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/channel_service_adapter.py (98%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/channel_service_client_factory_base.py (89%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/__init__.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/agent_conversation_reference.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/channel_factory_protocol.py (74%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/channel_host_protocol.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/channel_info_protocol.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/channel_protocol.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/channels_configuration.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/configuration_channel_host.py (97%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/conversation_constants.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/conversation_id_factory.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/conversation_id_factory_options.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/conversation_id_factory_protocol.py (100%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/http_agent_channel.py (97%) rename libraries/{microsoft-agents-client/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/client/http_agent_channel_factory.py (82%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/__init__.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/agent_sign_in_base.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/attachments_base.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/client/__init__.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/client/connector_client.py (99%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/client/user_token_client.py (99%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/connector_client_base.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/conversations_base.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/get_product_info.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/teams/__init__.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/teams/teams_connector_client.py (98%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/user_token_base.py (100%) rename libraries/{microsoft-agents-connector/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/connector/user_token_client_base.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/message_factory.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/middleware_set.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/oauth_flow.py (98%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/rest_channel_service_client_factory.py (87%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/state/__init__.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/state/agent_state.py (99%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/state/state_property_accessor.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/state/user_state.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/__init__.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/_type_aliases.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/error_handling.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/memory_storage.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/storage.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/storage_test_utils.py (100%) rename libraries/{microsoft-agents-storage/microsoft/agents => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/storage/store_item.py (100%) rename libraries/{microsoft-agents-builder/microsoft/agents/builder => microsoft-agents-hosting-core/microsoft/agents/hosting/core}/turn_context.py (100%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/pyproject.toml (84%) create mode 100644 libraries/microsoft-agents-hosting-core/tests/__init__.py rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/test_activity_handler.py (98%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/test_agent_state.py (98%) rename libraries/{microsoft-agents-storage => microsoft-agents-hosting-core}/tests/test_error_handling.py (100%) rename libraries/{microsoft-agents-storage => microsoft-agents-hosting-core}/tests/test_memory_storage.py (100%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/test_state.py (98%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/test_turn_context.py (99%) rename libraries/{microsoft-agents-storage => microsoft-agents-hosting-core}/tests/test_utils.py (100%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/tools/testing_adapter.py (97%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/tools/testing_flow.py (100%) rename libraries/{microsoft-agents-builder => microsoft-agents-hosting-core}/tests/tools/testing_utility.py (95%) rename libraries/{microsoft-agents-blob => microsoft-agents-storage-blob}/microsoft/agents/blob/__init__.py (100%) rename libraries/{microsoft-agents-blob => microsoft-agents-storage-blob}/microsoft/agents/blob/blob_storage.py (100%) rename libraries/{microsoft-agents-blob => microsoft-agents-storage-blob}/microsoft/agents/blob/blob_storage_config.py (100%) rename libraries/{microsoft-agents-blob => microsoft-agents-storage-blob}/pyproject.toml (100%) rename libraries/{microsoft-agents-blob => microsoft-agents-storage-blob}/tests/test_blob_storage.py (100%) delete mode 100644 libraries/microsoft-agents-storage/pyproject.toml diff --git a/libraries/microsoft-agents-builder/tests/__init__.py b/libraries/microsoft-agents-activity/microsoft/__init__.py similarity index 100% rename from libraries/microsoft-agents-builder/tests/__init__.py rename to libraries/microsoft-agents-activity/microsoft/__init__.py diff --git a/libraries/microsoft-agents-activity/microsoft/agents/__init__.py b/libraries/microsoft-agents-activity/microsoft/agents/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/__init__.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/__init__.py similarity index 95% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/__init__.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/__init__.py index 7537dfb9e..7b91fff7b 100644 --- a/libraries/microsoft-agents-core/microsoft/agents/core/models/__init__.py +++ b/libraries/microsoft-agents-activity/microsoft/agents/activity/__init__.py @@ -92,6 +92,11 @@ from .conversation_update_types import ConversationUpdateTypes from .message_update_types import MessageUpdateTypes + +from .channel_adapter_protocol import ChannelAdapterProtocol +from .turn_context_protocol import TurnContextProtocol +from ._load_configuration import load_configuration_from_env + __all__ = [ "AgentsModel", "Activity", @@ -180,4 +185,7 @@ "CallerIdConstants", "ConversationUpdateTypes", "MessageUpdateTypes", + "load_configuration_from_env", + "ChannelAdapterProtocol", + "TurnContextProtocol", ] diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/_load_configuration.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/_load_configuration.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/_load_configuration.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/_load_configuration.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/_type_aliases.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/_type_aliases.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/_type_aliases.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/action_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/action_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/action_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/action_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/activity.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/activity.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/activity.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/activity.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/activity_event_names.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/activity_event_names.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/activity_event_names.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/activity_importance.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/activity_importance.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/activity_importance.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/activity_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/activity_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/activity_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/activity_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_action.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_action.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_action.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_value.py similarity index 81% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_value.py index 8035cc2c9..ef928e0b2 100644 --- a/libraries/microsoft-agents-core/microsoft/agents/core/models/adaptive_card_invoke_value.py +++ b/libraries/microsoft-agents-activity/microsoft/agents/activity/adaptive_card_invoke_value.py @@ -10,9 +10,9 @@ class AdaptiveCardInvokeValue(AgentsModel): Defines the structure that arrives in the Activity.Value for Invoke activity with Name of 'adaptiveCard/action'. :param action: The action of this adaptive card invoke action value. - :type action: :class:`microsoft.agents.core.models.AdaptiveCardInvokeAction` + :type action: :class:`microsoft.agents.activity.models.AdaptiveCardInvokeAction` :param authentication: The TokenExchangeInvokeRequest for this adaptive card invoke action value. - :type authentication: :class:`microsoft.agents.core.models.TokenExchangeInvokeRequest` + :type authentication: :class:`microsoft.agents.activity.models.TokenExchangeInvokeRequest` :param state: The 'state' or magic code for an OAuth flow. :type state: str """ diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/agents_model.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/agents_model.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/agents_model.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/agents_model.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/ai_entity.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/ai_entity.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/ai_entity.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/animation_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/animation_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/animation_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/animation_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/attachment.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/attachment.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/attachment.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_data.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_data.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_data.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_layout_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_layout_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_layout_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_view.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/attachment_view.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/attachment_view.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/audio_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/audio_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/audio_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/audio_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/basic_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/basic_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/basic_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/basic_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/caller_id_constants.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/caller_id_constants.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/caller_id_constants.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/card_action.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/card_action.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/card_action.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/card_action.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/card_image.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/card_image.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/card_image.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/card_image.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/channel_account.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_account.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/channel_account.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/channel_account.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py similarity index 97% rename from libraries/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py index c22c61fe7..4734b8c50 100644 --- a/libraries/microsoft-agents-core/microsoft/agents/core/channel_adapter_protocol.py +++ b/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py @@ -44,7 +44,7 @@ async def continue_conversation( ) -> None: pass - # TODO: potentially move ClaimsIdentity to core + # TODO: potentially move ClaimsIdentity to activity @abstractmethod async def continue_conversation_with_claims( self, diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/channels.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/channels.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/channels.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/channels.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/contact_relation_update_action_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/contact_relation_update_action_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/contact_relation_update_action_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_account.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_account.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_account.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_members.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_members.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_members.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_parameters.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_parameters.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_parameters.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_reference.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_reference.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_reference.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_resource_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_resource_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_resource_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_update_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversation_update_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversation_update_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/conversations_result.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/conversations_result.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/conversations_result.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/delivery_modes.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/delivery_modes.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/delivery_modes.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/end_of_conversation_codes.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/end_of_conversation_codes.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/end_of_conversation_codes.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/entity.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/entity.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/entity.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/entity.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/error.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/error.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/error.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/error.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/error_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/error_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/error_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/error_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/expected_replies.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/expected_replies.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/expected_replies.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/fact.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/fact.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/fact.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/fact.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/geo_coordinates.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/geo_coordinates.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/geo_coordinates.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/hero_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/hero_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/hero_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/hero_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/inner_http_error.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/inner_http_error.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/inner_http_error.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/input_hints.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/input_hints.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/input_hints.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/input_hints.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/installation_update_action_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/installation_update_action_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/installation_update_action_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/invoke_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/invoke_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/invoke_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/media_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/media_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/media_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/media_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/media_event_value.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/media_event_value.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/media_event_value.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/media_url.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/media_url.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/media_url.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/media_url.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/mention.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/mention.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/mention.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/mention.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/message_reaction.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/message_reaction.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/message_reaction_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/message_reaction_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/message_reaction_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/message_update_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/message_update_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/message_update_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/oauth_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/oauth_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/oauth_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/paged_members_result.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/paged_members_result.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/paged_members_result.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/place.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/place.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/place.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/place.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/receipt_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/receipt_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/receipt_item.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/receipt_item.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/receipt_item.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/resource_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/resource_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/resource_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/resource_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/role_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/role_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/role_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/role_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/semantic_action.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_action.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/semantic_action.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/semantic_actions_states.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/semantic_actions_states.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/semantic_actions_states.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/sign_in_constants.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_constants.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/sign_in_constants.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/sign_in_resource.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/sign_in_resource.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/sign_in_resource.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/signin_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/signin_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/signin_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/signin_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/suggested_actions.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/suggested_actions.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/suggested_actions.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/__init__.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/__init__.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/__init__.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/app_based_link_query.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/app_based_link_query.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/app_based_link_query.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_failed_entries_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entries_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_failed_entries_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_failed_entry.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_failed_entry.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_failed_entry.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_operation_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_operation_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_operation_state_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/batch_operation_state_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/batch_operation_state_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/bot_config_auth.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/bot_config_auth.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/bot_config_auth.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/cache_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cache_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/cache_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/cancel_operation_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/cancel_operation_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/cancel_operation_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/channel_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/channel_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/channel_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_auth_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_auth_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_auth_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_response_base.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_response_base.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_response_base.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_task_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/config_task_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/config_task_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/conversation_list.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/conversation_list.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/conversation_list.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_consent_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_consent_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_consent_card_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_consent_card_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_consent_card_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_download_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_download_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_download_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_info_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_info_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_info_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_upload_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/file_upload_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/file_upload_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_details_base.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_details_base.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_details_base.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_end_event_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_end_event_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_end_event_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_event_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_event_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_event_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_base.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_base.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_base.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_channel_data.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_channel_data.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_channel_data.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_recipient_failure_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_recipient_failure_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_recipient_failure_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_notification_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_notification_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_participant_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participant_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_participant_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_participants_event_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_participants_event_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_participants_event_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_stage_surface.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_stage_surface.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_stage_surface.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_start_event_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_start_event_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_start_event_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_tab_icon_surface.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/meeting_tab_icon_surface.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/meeting_tab_icon_surface.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_app.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_app.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_app.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_attachment.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_attachment.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_attachment.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_body.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_body.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_body.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_conversation.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_conversation.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_conversation.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_from.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_from.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_from.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_mention.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_mention.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_mention.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_reaction.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_reaction.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_reaction.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_user.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/message_actions_payload_user.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/message_actions_payload_user.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_action.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_action.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_action_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_action_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_action_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_attachment.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_attachment.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_attachment.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_parameter.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_parameter.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_parameter.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_query.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_query.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_query_options.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_query_options.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_query_options.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_result.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_result.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_result.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_suggested_action.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/messaging_extension_suggested_action.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/messaging_extension_suggested_action.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/notification_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/notification_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/notification_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_action_base.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_base.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_action_base.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_action_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_action_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_action_query.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_action_query.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_action_query.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_date_input.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_date_input.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_date_input.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_fact.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_fact.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_fact.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_http_post.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_http_post.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_http_post.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_image.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_image.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_image.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_input_base.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_input_base.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_input_base.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_multichoice_input.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_multichoice_input.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_multichoice_input_choice.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_multichoice_input_choice.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_multichoice_input_choice.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_open_uri.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_open_uri.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_open_uri_target.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_open_uri_target.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_open_uri_target.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_section.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_section.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_section.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_text_input.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_text_input.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_text_input.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_view_action.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/o365_connector_card_view_action.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/o365_connector_card_view_action.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/on_behalf_of.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/on_behalf_of.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/on_behalf_of.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/read_receipt_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/read_receipt_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/read_receipt_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/signin_state_verification_query.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/signin_state_verification_query.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/signin_state_verification_query.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/surface.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/surface.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/surface.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_context.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_context.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_context.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_entity_context.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_entity_context.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_entity_context.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_request.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_request.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_request.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response_cards.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_cards.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response_cards.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response_payload.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_response_payload.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_response_payload.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_submit.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_submit.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_submit_data.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_submit_data.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_submit_data.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_suggested_actions.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tab_suggested_actions.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tab_suggested_actions.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/targeted_meeting_notification.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/targeted_meeting_notification.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/targeted_meeting_notification_value.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/targeted_meeting_notification_value.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/targeted_meeting_notification_value.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_card_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_card_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_card_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_continue_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_continue_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_continue_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_message_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_message_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_message_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_request.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_request.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_request_context.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_request_context.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_request_context.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_response_base.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_response_base.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_response_base.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_task_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/task_module_task_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/task_module_task_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/team_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/team_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/team_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/team_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/team_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_batch_operation_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_batch_operation_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_batch_operation_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_channel_account.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_account.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_channel_account.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_channel_data.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_channel_data.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_channel_data_settings.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_channel_data_settings.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_channel_data_settings.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_meeting_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_meeting_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_meeting_member.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_member.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_meeting_member.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_meeting_participant.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_meeting_participant.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_meeting_participant.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_member.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_member.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_member.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_paged_members_result.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/teams_paged_members_result.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/teams_paged_members_result.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tenant_info.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/tenant_info.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/tenant_info.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/teams/user_meeting_details.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/teams/user_meeting_details.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/teams/user_meeting_details.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/text_format_types.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/text_format_types.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/text_format_types.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/text_highlight.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/text_highlight.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/text_highlight.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/thing.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/thing.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/thing.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/thing.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/thumbnail_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/thumbnail_card.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/thumbnail_url.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/thumbnail_url.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/thumbnail_url.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_invoke_request.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_request.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_invoke_request.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_invoke_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_invoke_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_invoke_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_resource.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_resource.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_resource.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_state.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_exchange_state.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_exchange_state.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_post_resource.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_post_resource.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_post_resource.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_request.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_request.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_request.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_request.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_response.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_response.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_response.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_response.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/token_status.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/token_status.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/token_status.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/token_status.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/transcript.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/transcript.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/transcript.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/transcript.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/turn_context_protocol.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/models/video_card.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/video_card.py similarity index 100% rename from libraries/microsoft-agents-core/microsoft/agents/core/models/video_card.py rename to libraries/microsoft-agents-activity/microsoft/agents/activity/video_card.py diff --git a/libraries/microsoft-agents-core/pyproject.toml b/libraries/microsoft-agents-activity/pyproject.toml similarity index 100% rename from libraries/microsoft-agents-core/pyproject.toml rename to libraries/microsoft-agents-activity/pyproject.toml diff --git a/libraries/microsoft-agents-core/tests/test_activity_types.py b/libraries/microsoft-agents-activity/tests/test_activity_types.py similarity index 100% rename from libraries/microsoft-agents-core/tests/test_activity_types.py rename to libraries/microsoft-agents-activity/tests/test_activity_types.py diff --git a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py index 0e2c91840..eafc40fb1 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py @@ -13,12 +13,12 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( AccessTokenProviderBase, AgentAuthConfiguration, ) -from microsoft.agents.authorization.auth_types import AuthTypes +from microsoft.agents.hosting.authorization import AuthTypes class MsalAuth(AccessTokenProviderBase): diff --git a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py index 4c61101a9..472240ff2 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py @@ -1,5 +1,5 @@ from typing import Dict, List, Optional -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( AgentAuthConfiguration, AccessTokenProviderBase, ClaimsIdentity, diff --git a/libraries/microsoft-agents-authorization/pyproject.toml b/libraries/microsoft-agents-authorization/pyproject.toml deleted file mode 100644 index fd98db9d4..000000000 --- a/libraries/microsoft-agents-authorization/pyproject.toml +++ /dev/null @@ -1,21 +0,0 @@ -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" - -[project] -name = "microsoft-agents-authorization" -version = "0.0.0a1" -description = "An authorization library for Microsoft Agents" -authors = [{name = "Microsoft Corporation"}] -requires-python = ">=3.9" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", -] -dependencies = [ - "pyjwt>=2.10.1" -] - -[project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/__init__.py b/libraries/microsoft-agents-builder/microsoft/agents/builder/__init__.py deleted file mode 100644 index 4fb94606e..000000000 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -# Import necessary modules -from .activity_handler import ActivityHandler -from .agent import Agent -from .oauth_flow import OAuthFlow -from .card_factory import CardFactory -from .channel_adapter import ChannelAdapter -from .channel_api_handler_protocol import ChannelApiHandlerProtocol -from .channel_service_adapter import ChannelServiceAdapter -from .channel_service_client_factory_base import ChannelServiceClientFactoryBase -from .message_factory import MessageFactory -from .middleware_set import Middleware -from .rest_channel_service_client_factory import RestChannelServiceClientFactory -from .turn_context import TurnContext - -# Define the package's public interface -__all__ = [ - "ActivityHandler", - "Agent", - "OAuthFlow", - "CardFactory", - "ChannelAdapter", - "ChannelApiHandlerProtocol", - "ChannelServiceAdapter", - "ChannelServiceClientFactoryBase", - "MessageFactory", - "Middleware", - "RestChannelServiceClientFactory", - "TurnContext", -] diff --git a/libraries/microsoft-agents-client/pyproject.toml b/libraries/microsoft-agents-client/pyproject.toml deleted file mode 100644 index ad02799b4..000000000 --- a/libraries/microsoft-agents-client/pyproject.toml +++ /dev/null @@ -1,22 +0,0 @@ -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" - -[project] -name = "microsoft-agents-client" -version = "0.0.0a1" -description = "A client library for Microsoft Agents" -authors = [{name = "Microsoft Corporation"}] -requires-python = ">=3.9" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", -] -dependencies = [ - "microsoft-agents-core", - "microsoft-agents-authorization", -] - -[project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" diff --git a/libraries/microsoft-agents-connector/pyproject.toml b/libraries/microsoft-agents-connector/pyproject.toml deleted file mode 100644 index f59bd6952..000000000 --- a/libraries/microsoft-agents-connector/pyproject.toml +++ /dev/null @@ -1,24 +0,0 @@ -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" - -[project] -name = "microsoft-agents-connector" -version = "0.0.0a1" -description = "A client library for Microsoft Agents" -authors = [{name = "Microsoft Corporation"}] -requires-python = ">=3.9" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", -] -dependencies = [ - "isodate>=0.6.1", - "azure-core>=1.30.0", - "microsoft-agents-core", - "microsoft-agents-authorization", -] - -[project.urls] -"Homepage" = "https://github.com/yourusername/microsoft-agents-client" diff --git a/libraries/microsoft-agents-core/microsoft/agents/core/__init__.py b/libraries/microsoft-agents-core/microsoft/agents/core/__init__.py deleted file mode 100644 index 4bd84712d..000000000 --- a/libraries/microsoft-agents-core/microsoft/agents/core/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -from .channel_adapter_protocol import ChannelAdapterProtocol -from .turn_context_protocol import TurnContextProtocol -from ._load_configuration import load_configuration_from_env - -__all__ = [ - "load_configuration_from_env", - "ChannelAdapterProtocol", - "TurnContextProtocol", -] diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py index f6f25a978..227955ebf 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py @@ -1,6 +1,6 @@ from typing import Optional from aiohttp.web import Request, Response -from microsoft.agents.builder.app import AgentApplication +from microsoft.agents.hosting.app import AgentApplication from .cloud_adapter import CloudAdapter diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py index 305aec5f9..6be005815 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py @@ -9,7 +9,7 @@ Response, ) -from microsoft.agents.builder import Agent +from microsoft.agents.hosting import Agent class AgentHttpAdapter(Protocol): diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py index 5d6ed5813..9b2b05aac 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py @@ -18,7 +18,7 @@ ) if TYPE_CHECKING: - from microsoft.agents.builder.turn_context import TurnContext + from microsoft.agents.hosting.turn_context import TurnContext from .citation import Citation from .citation_util import CitationUtil diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py index 5c9bfa7c4..6a87612b8 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py @@ -12,7 +12,7 @@ ConversationParameters, Transcript, ) -from microsoft.agents.builder import ChannelApiHandlerProtocol +from microsoft.agents.hosting import ChannelApiHandlerProtocol async def deserialize_from_body( diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py index a4cd14c86..4b86bfb35 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py @@ -12,8 +12,7 @@ HTTPUnauthorized, HTTPUnsupportedMediaType, ) -from microsoft.agents.authorization import ( - AgentAuthConfiguration, +from microsoft.agents.hosting.authorization import ( ClaimsIdentity, Connections, ) @@ -21,7 +20,7 @@ Activity, DeliveryModes, ) -from microsoft.agents.builder import ( +from microsoft.agents.hosting import ( Agent, ChannelServiceAdapter, ChannelServiceClientFactoryBase, diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py index e08884db0..fab6d5735 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py @@ -1,7 +1,7 @@ import functools from aiohttp.web import Request, middleware, json_response -from microsoft.agents.authorization import AgentAuthConfiguration, JwtTokenValidator +from microsoft.agents.hosting.authorization import AgentAuthConfiguration, JwtTokenValidator @middleware diff --git a/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml index b7e04c1ad..31ca0d103 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml +++ b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ ] dependencies = [ "microsoft-agents-connector", - "microsoft-agents-builder", + "microsoft-agents-hosting", "aiohttp>=3.11.11", ] diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py similarity index 99% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py index 9ca5b5c97..f11763988 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py @@ -34,7 +34,7 @@ async def on_turn( ): # pylint: disable=arguments-differ """ Called by the adapter (for example, :class:`ChannelAdapter`) at runtime - in order to process an inbound :class:`builder.schema.Activity`. + in order to process an inbound :class:`hosting.schema.Activity`. :param turn_context: The context object for this turn :type turn_context: :class:`microsoft.agents.builder.TurnContext` @@ -522,7 +522,7 @@ async def on_adaptive_card_invoke( :param turn_context: A context object for this turn. :type turn_context: :class:`microsoft.agents.builder.TurnContext` :param invoke_value: A string-typed object from the incoming activity's value. - :type invoke_value: :class:`microsoft.agents.core.models.AdaptiveCardInvokeValue` + :type invoke_value: :class:`microsoft.agents.activity.models.AdaptiveCardInvokeValue` :return: The HealthCheckResponse object """ raise _InvokeResponseException(HTTPStatus.NOT_IMPLEMENTED) diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/agent.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/agent.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/agent.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/agent.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/__init__.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/__init__.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py similarity index 99% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py index 5ffe18317..85ff67dc7 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/agent_application.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py @@ -7,7 +7,6 @@ from copy import copy from functools import partial -from os import environ import re from typing import ( Any, @@ -23,11 +22,9 @@ cast, ) -from dotenv import load_dotenv -from microsoft.agents.authorization import AgentAuthConfiguration, Connections +from microsoft.agents.hosting.authorization import Connections -from .. import Agent, TurnContext -from microsoft.agents.core import load_configuration_from_env +from microsoft.agents.hosting import Agent, TurnContext from microsoft.agents.core.models import ( Activity, ActivityTypes, diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_error.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_error.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_error.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py similarity index 97% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py index 260c45125..c8ffd7e2d 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/app_options.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py @@ -9,7 +9,7 @@ from logging import Logger from typing import Callable, List, Optional -from microsoft.agents.builder.app.oauth.authorization import AuthorizationHandlers +from microsoft.agents.hosting.app.oauth.authorization import AuthorizationHandlers from microsoft.agents.storage import Storage # from .auth import AuthOptions diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py similarity index 95% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py index 70a74c465..5182fadc2 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/input_file.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py @@ -9,7 +9,7 @@ from dataclasses import dataclass from typing import List, Optional -from .. import TurnContext +from microsoft.agents.hosting import TurnContext @dataclass diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/__init__.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/__init__.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py similarity index 99% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py index b0d0b341f..446fcea7f 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/oauth/authorization.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py @@ -5,7 +5,7 @@ import jwt from typing import Dict, Optional, Callable, Awaitable -from microsoft.agents.authorization import Connections, AccessTokenProviderBase +from microsoft.agents.hosting.authorization import Connections, AccessTokenProviderBase from microsoft.agents.storage import Storage from microsoft.agents.core.models import TokenResponse, Activity from microsoft.agents.storage import StoreItem diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/query.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/query.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/query.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/query.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/route.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py similarity index 94% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/route.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py index 761a7ede9..272d5df61 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/route.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py @@ -7,7 +7,7 @@ from typing import Awaitable, Callable, Generic, List, TypeVar -from .. import TurnContext +from microsoft.agents.hosting import TurnContext from .state import TurnState StateT = TypeVar("StateT", bound=TurnState) diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/__init__.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/__init__.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py similarity index 91% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py index 2281a771d..421b0ea2f 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/conversation_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py @@ -9,8 +9,8 @@ from microsoft.agents.storage import Storage, StoreItem -from microsoft.agents.builder.turn_context import TurnContext -from microsoft.agents.builder.state import AgentState +from microsoft.agents.hosting.turn_context import TurnContext +from microsoft.agents.hosting.state import AgentState class ConversationState(AgentState): diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py similarity index 97% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py index 3e57b6ddd..a370c0a09 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py @@ -10,12 +10,12 @@ from copy import deepcopy from typing import Any, Callable, List, Optional, Type, TypeVar, Union, overload -from microsoft.agents.builder.state.state_property_accessor import ( +from microsoft.agents.hosting.state.state_property_accessor import ( StatePropertyAccessor as _StatePropertyAccessor, ) from microsoft.agents.storage import Storage, StoreItem -from microsoft.agents.builder.turn_context import TurnContext +from microsoft.agents.hosting.turn_context import TurnContext T = TypeVar("T") diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py similarity index 94% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py index 496d623b2..4aa024bff 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/temp_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py @@ -9,9 +9,9 @@ from microsoft.agents.storage import Storage -from microsoft.agents.builder.turn_context import TurnContext -from microsoft.agents.builder.app.input_file import InputFile -from microsoft.agents.builder.state import AgentState +from microsoft.agents.hosting.turn_context import TurnContext +from microsoft.agents.hosting.app.input_file import InputFile +from microsoft.agents.hosting.state import AgentState T = TypeVar("T") diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py similarity index 96% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py index 19db88fd3..6fbd859a5 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/state/turn_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py @@ -10,11 +10,11 @@ from microsoft.agents.storage import Storage -from microsoft.agents.builder.turn_context import TurnContext -from microsoft.agents.builder.app.state.conversation_state import ConversationState -from microsoft.agents.builder.state import AgentState -from microsoft.agents.builder.app.state.temp_state import TempState -from microsoft.agents.builder.state.user_state import UserState +from microsoft.agents.hosting.turn_context import TurnContext +from microsoft.agents.hosting.app.state.conversation_state import ConversationState +from microsoft.agents.hosting.state import AgentState +from microsoft.agents.hosting.app.state.temp_state import TempState +from microsoft.agents.hosting.state.user_state import UserState ConversationStateT = TypeVar("ConversationStateT", bound=ConversationState) UserStateT = TypeVar("UserStateT", bound=UserState) diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py similarity index 96% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py index cf67f52af..abcd931fb 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/app/typing_indicator.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py @@ -8,7 +8,7 @@ from threading import Timer from typing import Optional -from .. import TurnContext +from microsoft.agents.hosting import TurnContext from microsoft.agents.core.models import Activity, ActivityTypes diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/__init__.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/__init__.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/access_token_provider_base.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/access_token_provider_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/access_token_provider_base.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py similarity index 96% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py index fb7f5507c..ec4600534 100644 --- a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/agent_auth_configuration.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py @@ -1,6 +1,6 @@ from typing import Optional -from microsoft.agents.authorization.auth_types import AuthTypes +from microsoft.agents.hosting.authorization.auth_types import AuthTypes class AgentAuthConfiguration: diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/anonymous_token_provider.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/anonymous_token_provider.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/anonymous_token_provider.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/auth_types.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/auth_types.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/auth_types.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/authentication_constants.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/authentication_constants.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/authentication_constants.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/claims_identity.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/claims_identity.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/claims_identity.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/connections.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/connections.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/connections.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/connections.py diff --git a/libraries/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/jwt_token_validator.py similarity index 100% rename from libraries/microsoft-agents-authorization/microsoft/agents/authorization/jwt_token_validator.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/jwt_token_validator.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/card_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/card_factory.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/card_factory.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/card_factory.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py similarity index 96% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py index c379a5b3b..12972cd5e 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_adapter.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py @@ -4,7 +4,7 @@ from abc import ABC, abstractmethod from collections.abc import Callable from typing import List, Awaitable -from microsoft.agents.authorization import ClaimsIdentity +from microsoft.agents.hosting.authorization import ClaimsIdentity from microsoft.agents.core import ChannelAdapterProtocol from microsoft.agents.core.models import ( Activity, @@ -55,7 +55,7 @@ async def update_activity(self, context: TurnContext, activity: Activity): :param context: The context object for the turn. :type context: :class:`TurnContext` :param activity: New replacement activity. - :type activity: :class:`builder.schema.Activity` + :type activity: :class:`hosting.schema.Activity` :return: """ raise NotImplementedError() @@ -70,7 +70,7 @@ async def delete_activity( :param context: The context object for the turn. :type context: :class:`TurnContext` :param reference: Conversation reference for the activity to delete. - :type reference: :class:`builder.schema.ConversationReference` + :type reference: :class:`hosting.schema.ConversationReference` :return: """ raise NotImplementedError() @@ -100,7 +100,7 @@ async def continue_conversation( single tenant the Adapters (Console, Test, etc) but is critical to the ChannelAdapter which is multi-tenant aware. :param reference: A reference to the conversation to continue. - :type reference: :class:`builder.schema.ConversationReference` + :type reference: :class:`hosting.schema.ConversationReference` :param callback: The method to call for the resulting agent turn. :type callback: :class:`typing.Callable` :param claims_identity: A :class:`microsoft.agents.authentication.ClaimsIdentity` for the conversation. @@ -126,7 +126,7 @@ async def continue_conversation_with_claims( :param claims_identity: A :class:`microsoft.agents.authentication.ClaimsIdentity` for the conversation. :type claims_identity: :class:`microsoft.agents.authentication.ClaimsIdentity` :param continuation_activity: The activity to send. - :type continuation_activity: :class:`builder + :type continuation_activity: :class:`hosting :param callback: The method to call for the resulting agent turn. :type callback: :class:`typing.Callable` :param audience: A value signifying the recipient of the proactive message. @@ -155,7 +155,7 @@ async def create_conversation( :param audience: A value signifying the recipient of the proactive message. :type audience: str :param conversation_parameters: The information to use to create the conversation - :type conversation_parameters: :class:`microsoft.agents.core.models.ConversationParameters` + :type conversation_parameters: :class:`microsoft.agents.activity.models.ConversationParameters` :param callback: The method to call for the resulting agent turn. :type callback: :class:`typing.Callable[[TurnContext], Awaitable]` diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py similarity index 98% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py index 12d08fa48..ce6288e9b 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_api_handler_protocol.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py @@ -13,7 +13,7 @@ Transcript, ) -from microsoft.agents.authorization import ClaimsIdentity +from microsoft.agents.hosting.authorization import ClaimsIdentity class ChannelApiHandlerProtocol(Protocol): diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py similarity index 98% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py index 803c12d9d..57b146a20 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py @@ -25,13 +25,13 @@ InvokeResponse, ResourceResponse, ) -from microsoft.agents.connector import ( +from microsoft.agents.hosting.connector import ( ConnectorClientBase, UserTokenClientBase, ConnectorClient, UserTokenClient, ) -from microsoft.agents.authorization import AuthenticationConstants, ClaimsIdentity +from microsoft.agents.hosting.authorization import AuthenticationConstants, ClaimsIdentity from .channel_service_client_factory_base import ChannelServiceClientFactoryBase from .channel_adapter import ChannelAdapter from .turn_context import TurnContext @@ -152,7 +152,7 @@ async def continue_conversation( # pylint: disable=arguments-differ to the user. :param reference: A reference to the conversation to continue. - :type reference: :class:`builder.schema.ConversationReference` + :type reference: :class:`hosting.schema.ConversationReference` :param callback: The method to call for the resulting agent turn. :type callback: :class:`typing.Callable` :param agent_app_id: The application Id of the agent. This is the appId returned by the Azure portal registration, diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py similarity index 89% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py index e6ebe8061..839370c42 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/channel_service_client_factory_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py @@ -1,8 +1,8 @@ from typing import Protocol, Optional from abc import abstractmethod -from microsoft.agents.authorization import ClaimsIdentity -from microsoft.agents.connector import ConnectorClientBase, UserTokenClientBase +from microsoft.agents.hosting.authorization import ClaimsIdentity +from microsoft.agents.hosting.connector import ConnectorClientBase, UserTokenClientBase class ChannelServiceClientFactoryBase(Protocol): diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/__init__.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/__init__.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/agent_conversation_reference.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/agent_conversation_reference.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/agent_conversation_reference.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py similarity index 74% rename from libraries/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py index 2d59e8588..6b30f3c4e 100644 --- a/libraries/microsoft-agents-client/microsoft/agents/client/channel_factory_protocol.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py @@ -1,6 +1,6 @@ from typing import Protocol -from microsoft.agents.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.authorization import AccessTokenProviderBase from .channel_protocol import ChannelProtocol diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_host_protocol.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/channel_host_protocol.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_host_protocol.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_info_protocol.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/channel_info_protocol.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_info_protocol.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/channel_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_protocol.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/channel_protocol.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_protocol.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/channels_configuration.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channels_configuration.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/channels_configuration.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channels_configuration.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py similarity index 97% rename from libraries/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py index 7cffbf71a..9126130df 100644 --- a/libraries/microsoft-agents-client/microsoft/agents/client/configuration_channel_host.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py @@ -1,6 +1,6 @@ from copy import copy -from microsoft.agents.authorization import Connections +from microsoft.agents.hosting.authorization import Connections from .channels_configuration import ChannelsConfiguration from .channel_factory_protocol import ChannelFactoryProtocol diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/conversation_constants.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_constants.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/conversation_constants.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_constants.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_options.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_options.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_options.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_protocol.py similarity index 100% rename from libraries/microsoft-agents-client/microsoft/agents/client/conversation_id_factory_protocol.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_protocol.py diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py similarity index 97% rename from libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py index a389f0942..d2567abe5 100644 --- a/libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py @@ -1,7 +1,7 @@ from copy import deepcopy, copy from aiohttp import ClientSession -from microsoft.agents.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.authorization import AccessTokenProviderBase from microsoft.agents.core.models import ( AgentsModel, Activity, diff --git a/libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py similarity index 82% rename from libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py index 73c310998..353c34a74 100644 --- a/libraries/microsoft-agents-client/microsoft/agents/client/http_agent_channel_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py @@ -1,4 +1,4 @@ -from microsoft.agents.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.authorization import AccessTokenProviderBase from .channel_factory_protocol import ChannelFactoryProtocol from .channel_protocol import ChannelProtocol diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/__init__.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/__init__.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/agent_sign_in_base.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/agent_sign_in_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/agent_sign_in_base.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/attachments_base.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/attachments_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/attachments_base.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/__init__.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/__init__.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py similarity index 99% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py index affcd336d..976b377d9 100644 --- a/libraries/microsoft-agents-connector/microsoft/agents/connector/client/connector_client.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py @@ -5,7 +5,6 @@ import logging from typing import Any, Optional -import json from aiohttp import ClientSession from io import BytesIO @@ -18,7 +17,7 @@ ConversationsResult, PagedMembersResult, ) -from microsoft.agents.connector import ConnectorClientBase +from microsoft.agents.hosting.connector import ConnectorClientBase from ..attachments_base import AttachmentsBase from ..conversations_base import ConversationsBase from ..get_product_info import get_product_info diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py similarity index 99% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py index 4f66f067b..422c0e3dc 100644 --- a/libraries/microsoft-agents-connector/microsoft/agents/connector/client/user_token_client.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py @@ -7,7 +7,7 @@ from typing import Optional from aiohttp import ClientSession -from microsoft.agents.connector import UserTokenClientBase +from microsoft.agents.hosting.connector import UserTokenClientBase from microsoft.agents.core.models import TokenResponse, TokenStatus, SignInResource from ..get_product_info import get_product_info from ..user_token_base import UserTokenBase diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/connector_client_base.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/connector_client_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/connector_client_base.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/conversations_base.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/conversations_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/conversations_base.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/get_product_info.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/get_product_info.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/get_product_info.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/__init__.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/teams/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/__init__.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py similarity index 98% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py index 0ea90866a..e73d55876 100644 --- a/libraries/microsoft-agents-connector/microsoft/agents/connector/teams/teams_connector_client.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py @@ -7,14 +7,14 @@ from aiohttp import ClientSession from microsoft.agents.core.models import Activity, ResourceResponse -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( AccessTokenProviderBase, AgentAuthConfiguration, ) -from microsoft.agents.connector.client import ConnectorClient +from microsoft.agents.hosting.connector.client import ConnectorClient from microsoft.agents.core.models import ConversationParameters -from microsoft.agents.core.models.teams import ( +from microsoft.agents.core.teams import ( TeamsChannelAccount, TeamsPagedMembersResult, TeamDetails, diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_base.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_base.py diff --git a/libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_client_base.py similarity index 100% rename from libraries/microsoft-agents-connector/microsoft/agents/connector/user_token_client_base.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_client_base.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/message_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/message_factory.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/message_factory.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/message_factory.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/middleware_set.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/middleware_set.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/middleware_set.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py similarity index 98% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py index 43c54bebf..a7502ed84 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/oauth_flow.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py @@ -6,7 +6,7 @@ from datetime import datetime from typing import Dict, Optional -from microsoft.agents.connector.client import UserTokenClient +from microsoft.agents.hosting.connector.client import UserTokenClient from microsoft.agents.core.models import ( ActionTypes, ActivityTypes, @@ -25,8 +25,6 @@ from .message_factory import MessageFactory from .card_factory import CardFactory -from .state.state_property_accessor import StatePropertyAccessor -from .state.user_state import UserState class FlowState(StoreItem, BaseModel): diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py similarity index 87% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py index 2c797959f..0adef9521 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py @@ -1,15 +1,15 @@ -from typing import Any, Optional +from typing import Optional -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( AuthenticationConstants, AnonymousTokenProvider, ClaimsIdentity, Connections, ) -from microsoft.agents.authorization import AccessTokenProviderBase -from microsoft.agents.connector import ConnectorClientBase -from microsoft.agents.connector.client import UserTokenClient -from microsoft.agents.connector.teams import TeamsConnectorClient +from microsoft.agents.hosting.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.connector import ConnectorClientBase +from microsoft.agents.hosting.connector.client import UserTokenClient +from microsoft.agents.hosting.connector.teams import TeamsConnectorClient from .channel_service_client_factory_base import ChannelServiceClientFactoryBase diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/__init__.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/state/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/__init__.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py similarity index 99% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py index 6e076c73a..dc2b8d51f 100644 --- a/libraries/microsoft-agents-builder/microsoft/agents/builder/state/agent_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py @@ -69,7 +69,7 @@ def __init__(self, storage: Storage, context_service_key: str): Initializes a new instance of the :class:`BotState` class. :param storage: The storage layer this state management object will use to store and retrieve state - :type storage: :class:`bptbuilder.core.Storage` + :type storage: :class:`bptbuilder.activity.Storage` :param context_service_key: The key for the state cache for this :class:`BotState` :type context_service_key: str diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/state_property_accessor.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/state/state_property_accessor.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/state_property_accessor.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/user_state.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/state/user_state.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/user_state.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/__init__.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/__init__.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/__init__.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/_type_aliases.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/_type_aliases.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/_type_aliases.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/error_handling.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/error_handling.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/error_handling.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/error_handling.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/memory_storage.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/memory_storage.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/memory_storage.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/storage.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/storage.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/storage.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/storage.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/storage_test_utils.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/storage_test_utils.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/storage_test_utils.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/storage_test_utils.py diff --git a/libraries/microsoft-agents-storage/microsoft/agents/storage/store_item.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/store_item.py similarity index 100% rename from libraries/microsoft-agents-storage/microsoft/agents/storage/store_item.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/storage/store_item.py diff --git a/libraries/microsoft-agents-builder/microsoft/agents/builder/turn_context.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/turn_context.py similarity index 100% rename from libraries/microsoft-agents-builder/microsoft/agents/builder/turn_context.py rename to libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/turn_context.py diff --git a/libraries/microsoft-agents-builder/pyproject.toml b/libraries/microsoft-agents-hosting-core/pyproject.toml similarity index 84% rename from libraries/microsoft-agents-builder/pyproject.toml rename to libraries/microsoft-agents-hosting-core/pyproject.toml index 712ccb207..7ac1726ed 100644 --- a/libraries/microsoft-agents-builder/pyproject.toml +++ b/libraries/microsoft-agents-hosting-core/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] -name = "microsoft-agents-builder" +name = "microsoft-agents-hosting" version = "0.0.0a1" description = "A protocol library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] @@ -14,7 +14,9 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "microsoft-agents-connector", + "pyjwt>=2.10.1", + "isodate>=0.6.1", + "azure-core>=1.30.0", "microsoft-agents-core", "python-dotenv>=1.1.1", ] diff --git a/libraries/microsoft-agents-hosting-core/tests/__init__.py b/libraries/microsoft-agents-hosting-core/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/libraries/microsoft-agents-builder/tests/test_activity_handler.py b/libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py similarity index 98% rename from libraries/microsoft-agents-builder/tests/test_activity_handler.py rename to libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py index e0a53cee2..294aef39b 100644 --- a/libraries/microsoft-agents-builder/tests/test_activity_handler.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py @@ -1,6 +1,6 @@ import pytest from unittest.mock import AsyncMock -from microsoft.agents.builder import ActivityHandler, TurnContext +from microsoft.agents.hosting import ActivityHandler, TurnContext from microsoft.agents.core.models import ( ActivityTypes, ChannelAccount, diff --git a/libraries/microsoft-agents-builder/tests/test_agent_state.py b/libraries/microsoft-agents-hosting-core/tests/test_agent_state.py similarity index 98% rename from libraries/microsoft-agents-builder/tests/test_agent_state.py rename to libraries/microsoft-agents-hosting-core/tests/test_agent_state.py index 40f5079a9..11e8a29b2 100644 --- a/libraries/microsoft-agents-builder/tests/test_agent_state.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_agent_state.py @@ -10,14 +10,14 @@ from typing import Type from unittest.mock import AsyncMock, MagicMock -from microsoft.agents.builder.state.agent_state import ( +from microsoft.agents.hosting.state.agent_state import ( AgentState, CachedAgentState, BotStatePropertyAccessor, ) -from microsoft.agents.builder.state.user_state import UserState -from microsoft.agents.builder.app.state.conversation_state import ConversationState -from microsoft.agents.builder.turn_context import TurnContext +from microsoft.agents.hosting.state.user_state import UserState +from microsoft.agents.hosting.app.state.conversation_state import ConversationState +from microsoft.agents.hosting.turn_context import TurnContext from microsoft.agents.storage import Storage, StoreItem, MemoryStorage from microsoft.agents.core.models import ( Activity, diff --git a/libraries/microsoft-agents-storage/tests/test_error_handling.py b/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py similarity index 100% rename from libraries/microsoft-agents-storage/tests/test_error_handling.py rename to libraries/microsoft-agents-hosting-core/tests/test_error_handling.py diff --git a/libraries/microsoft-agents-storage/tests/test_memory_storage.py b/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py similarity index 100% rename from libraries/microsoft-agents-storage/tests/test_memory_storage.py rename to libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py diff --git a/libraries/microsoft-agents-builder/tests/test_state.py b/libraries/microsoft-agents-hosting-core/tests/test_state.py similarity index 98% rename from libraries/microsoft-agents-builder/tests/test_state.py rename to libraries/microsoft-agents-hosting-core/tests/test_state.py index 5b85c7dff..7bc92adce 100644 --- a/libraries/microsoft-agents-builder/tests/test_state.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_state.py @@ -7,8 +7,8 @@ import pytest from unittest.mock import AsyncMock, MagicMock -from microsoft.agents.builder.app.state.state import State, state, StatePropertyAccessor -from microsoft.agents.builder.turn_context import TurnContext +from microsoft.agents.hosting.app.state.state import State, state, StatePropertyAccessor +from microsoft.agents.hosting.turn_context import TurnContext from microsoft.agents.storage import Storage, StoreItem diff --git a/libraries/microsoft-agents-builder/tests/test_turn_context.py b/libraries/microsoft-agents-hosting-core/tests/test_turn_context.py similarity index 99% rename from libraries/microsoft-agents-builder/tests/test_turn_context.py rename to libraries/microsoft-agents-hosting-core/tests/test_turn_context.py index cd70d958e..3eab30d65 100644 --- a/libraries/microsoft-agents-builder/tests/test_turn_context.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_turn_context.py @@ -10,7 +10,7 @@ Mention, ResourceResponse, ) -from microsoft.agents.builder import ChannelAdapter, MessageFactory, TurnContext +from microsoft.agents.hosting import ChannelAdapter, MessageFactory, TurnContext activity_data = { "type": "message", diff --git a/libraries/microsoft-agents-storage/tests/test_utils.py b/libraries/microsoft-agents-hosting-core/tests/test_utils.py similarity index 100% rename from libraries/microsoft-agents-storage/tests/test_utils.py rename to libraries/microsoft-agents-hosting-core/tests/test_utils.py diff --git a/libraries/microsoft-agents-builder/tests/tools/testing_adapter.py b/libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py similarity index 97% rename from libraries/microsoft-agents-builder/tests/tools/testing_adapter.py rename to libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py index 23cac4826..73b7face3 100644 --- a/libraries/microsoft-agents-builder/tests/tools/testing_adapter.py +++ b/libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py @@ -4,12 +4,10 @@ import asyncio import uuid from datetime import datetime, timezone -from queue import Queue -from typing import Any, Callable, Dict, List, Optional, Union, Awaitable +from typing import Callable, List, Optional, Awaitable from collections import deque -from microsoft.agents.authorization import ClaimsIdentity -from microsoft.agents.core import ChannelAdapterProtocol +from microsoft.agents.hosting.authorization import ClaimsIdentity from microsoft.agents.core.models import ( Activity, ActivityTypes, @@ -21,10 +19,9 @@ RoleTypes, InvokeResponse, ) -from microsoft.agents.builder.channel_adapter import ChannelAdapter -from microsoft.agents.builder.turn_context import TurnContext -from microsoft.agents.builder.middleware_set import MiddlewareSet -from microsoft.agents.connector import UserTokenClient +from microsoft.agents.hosting.channel_adapter import ChannelAdapter +from microsoft.agents.hosting.turn_context import TurnContext +from microsoft.agents.hosting.connector import UserTokenClient AgentCallbackHandler = Callable[[TurnContext], Awaitable] diff --git a/libraries/microsoft-agents-builder/tests/tools/testing_flow.py b/libraries/microsoft-agents-hosting-core/tests/tools/testing_flow.py similarity index 100% rename from libraries/microsoft-agents-builder/tests/tools/testing_flow.py rename to libraries/microsoft-agents-hosting-core/tests/tools/testing_flow.py diff --git a/libraries/microsoft-agents-builder/tests/tools/testing_utility.py b/libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py similarity index 95% rename from libraries/microsoft-agents-builder/tests/tools/testing_utility.py rename to libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py index f8ef62909..1b6c3b372 100644 --- a/libraries/microsoft-agents-builder/tests/tools/testing_utility.py +++ b/libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py @@ -8,7 +8,7 @@ ConversationAccount, ChannelAccount, ) -from microsoft.agents.builder import TurnContext +from microsoft.agents.hosting import TurnContext class TestingUtility: diff --git a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py index aeea2cd11..0511a3855 100644 --- a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py +++ b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py @@ -6,13 +6,13 @@ from http import HTTPStatus from typing import Any, List -from microsoft.agents.builder import ActivityHandler, TurnContext +from microsoft.agents.hosting import ActivityHandler, TurnContext from microsoft.agents.core.models import ( InvokeResponse, ChannelAccount, ) -from microsoft.agents.core.models.teams import ( +from microsoft.agents.core.teams import ( AppBasedLinkQuery, TeamInfo, ChannelInfo, diff --git a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py index 8c4463968..beaa42bb8 100644 --- a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py +++ b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py @@ -7,7 +7,7 @@ from microsoft.agents.core.models import Activity, Channels, ConversationParameters -from microsoft.agents.core.models.teams import ( +from microsoft.agents.core.teams import ( TeamsChannelAccount, TeamsMeetingParticipant, MeetingInfo, @@ -22,8 +22,8 @@ TeamsBatchOperationResponse, ChannelInfo, ) -from microsoft.agents.connector.teams import TeamsConnectorClient -from microsoft.agents.builder import ChannelServiceAdapter, TurnContext +from microsoft.agents.hosting.connector.teams import TeamsConnectorClient +from microsoft.agents.hosting import ChannelServiceAdapter, TurnContext class TeamsInfo: diff --git a/libraries/microsoft-agents-hosting-teams/pyproject.toml b/libraries/microsoft-agents-hosting-teams/pyproject.toml index 47705c303..7965197c7 100644 --- a/libraries/microsoft-agents-hosting-teams/pyproject.toml +++ b/libraries/microsoft-agents-hosting-teams/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ ] dependencies = [ "microsoft-agents-connector", - "microsoft-agents-builder", + "microsoft-agents-hosting", "aiohttp>=3.11.11", ] diff --git a/libraries/microsoft-agents-blob/microsoft/agents/blob/__init__.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/__init__.py similarity index 100% rename from libraries/microsoft-agents-blob/microsoft/agents/blob/__init__.py rename to libraries/microsoft-agents-storage-blob/microsoft/agents/blob/__init__.py diff --git a/libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage.py similarity index 100% rename from libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage.py rename to libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage.py diff --git a/libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage_config.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage_config.py similarity index 100% rename from libraries/microsoft-agents-blob/microsoft/agents/blob/blob_storage_config.py rename to libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage_config.py diff --git a/libraries/microsoft-agents-blob/pyproject.toml b/libraries/microsoft-agents-storage-blob/pyproject.toml similarity index 100% rename from libraries/microsoft-agents-blob/pyproject.toml rename to libraries/microsoft-agents-storage-blob/pyproject.toml diff --git a/libraries/microsoft-agents-blob/tests/test_blob_storage.py b/libraries/microsoft-agents-storage-blob/tests/test_blob_storage.py similarity index 100% rename from libraries/microsoft-agents-blob/tests/test_blob_storage.py rename to libraries/microsoft-agents-storage-blob/tests/test_blob_storage.py diff --git a/libraries/microsoft-agents-storage/pyproject.toml b/libraries/microsoft-agents-storage/pyproject.toml deleted file mode 100644 index 6cad46e19..000000000 --- a/libraries/microsoft-agents-storage/pyproject.toml +++ /dev/null @@ -1,20 +0,0 @@ -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" - -[project] -name = "microsoft-agents-storage" -version = "0.0.0a1" -description = "A storage library for Microsoft Agents" -authors = [{name = "Microsoft Corporation"}] -requires-python = ">=3.9" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", -] -dependencies = [ -] - -[project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" diff --git a/test_samples/README.md b/test_samples/README.md index 5eac5f3e6..2faf8016c 100644 --- a/test_samples/README.md +++ b/test_samples/README.md @@ -85,13 +85,13 @@ Make sure it shows a version between 3.9 and 3.11 as required. After activating your virtual environment, you can install packages from pypi test (the test index will be replaced with the regular index before going out of preview): ```bash -pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-core +pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-activity pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-authorization pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-connector pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-client -pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-builder +pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-hosting-core pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-authentication-msal pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-copilotstudio-client -pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-hosting-aiohttp -pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-storage +pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-hosting-core-aiohttp +pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ microsoft-agents-storage-core ``` \ No newline at end of file diff --git a/test_samples/agent_to_agent/agent_1/agent1.py b/test_samples/agent_to_agent/agent_1/agent1.py index 37f2b2053..123264ac3 100644 --- a/test_samples/agent_to_agent/agent_1/agent1.py +++ b/test_samples/agent_to_agent/agent_1/agent1.py @@ -17,14 +17,14 @@ ConversationResourceResponse, ConversationsResult, ) -from microsoft.agents.authorization import ClaimsIdentity -from microsoft.agents.client import ( +from microsoft.agents.hosting.authorization import ClaimsIdentity +from microsoft.agents.hosting.client import ( ChannelHostProtocol, ChannelInfoProtocol, ConversationIdFactoryProtocol, ConversationIdFactoryOptions, ) -from microsoft.agents.builder import ( +from microsoft.agents.hosting import ( ActivityHandler, ChannelApiHandlerProtocol, ChannelAdapter, diff --git a/test_samples/agent_to_agent/agent_1/app.py b/test_samples/agent_to_agent/agent_1/app.py index b41e73d79..da74e2982 100644 --- a/test_samples/agent_to_agent/agent_1/app.py +++ b/test_samples/agent_to_agent/agent_1/app.py @@ -4,19 +4,19 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.builder import RestChannelServiceClientFactory +from microsoft.agents.hosting import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import ( CloudAdapter, jwt_authorization_middleware, channel_service_route_table, ) -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, ) from microsoft.agents.authentication.msal import MsalAuth -from microsoft.agents.client import ( +from microsoft.agents.hosting.client import ( ConfigurationChannelHost, ConversationIdFactory, HttpAgentChannelFactory, diff --git a/test_samples/agent_to_agent/agent_1/config.py b/test_samples/agent_to_agent/agent_1/config.py index 9533c2dd7..649e481d2 100644 --- a/test_samples/agent_to_agent/agent_1/config.py +++ b/test_samples/agent_to_agent/agent_1/config.py @@ -1,6 +1,6 @@ from os import environ from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration -from microsoft.agents.client import ( +from microsoft.agents.hosting.client import ( ChannelHostConfiguration, ChannelsConfiguration, ChannelInfo, diff --git a/test_samples/agent_to_agent/agent_2/agent2.py b/test_samples/agent_to_agent/agent_2/agent2.py index a38a033de..cfccc047d 100644 --- a/test_samples/agent_to_agent/agent_2/agent2.py +++ b/test_samples/agent_to_agent/agent_2/agent2.py @@ -1,4 +1,4 @@ -from microsoft.agents.builder import ActivityHandler, TurnContext +from microsoft.agents.hosting import ActivityHandler, TurnContext from microsoft.agents.core.models import ( ChannelAccount, Activity, diff --git a/test_samples/agent_to_agent/agent_2/app.py b/test_samples/agent_to_agent/agent_2/app.py index 3b4497b99..808286039 100644 --- a/test_samples/agent_to_agent/agent_2/app.py +++ b/test_samples/agent_to_agent/agent_2/app.py @@ -4,9 +4,9 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.builder import RestChannelServiceClientFactory +from microsoft.agents.hosting import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/app_style/authorization_agent.py b/test_samples/app_style/authorization_agent.py index 8f206dce0..cf59f86e5 100644 --- a/test_samples/app_style/authorization_agent.py +++ b/test_samples/app_style/authorization_agent.py @@ -7,14 +7,14 @@ import traceback from dotenv import load_dotenv -from microsoft.agents.builder.app import AgentApplication, TurnState -from microsoft.agents.builder.app.oauth import Authorization +from microsoft.agents.hosting.app import AgentApplication, TurnState +from microsoft.agents.hosting.app.oauth import Authorization from microsoft.agents.hosting.aiohttp import ( CloudAdapter, ) from microsoft.agents.authentication.msal import MsalConnectionManager -from microsoft.agents.builder import ( +from microsoft.agents.hosting import ( TurnContext, MessageFactory, ) diff --git a/test_samples/app_style/emtpy_agent.py b/test_samples/app_style/emtpy_agent.py index 53cf93a3d..c85c7f01a 100644 --- a/test_samples/app_style/emtpy_agent.py +++ b/test_samples/app_style/emtpy_agent.py @@ -9,20 +9,20 @@ from os import environ from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration -from microsoft.agents.builder.app import AgentApplication, TurnState +from microsoft.agents.hosting.app import AgentApplication, TurnState from microsoft.agents.hosting.aiohttp import ( CloudAdapter, jwt_authorization_middleware, start_agent_process, ) -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, ) from microsoft.agents.authentication.msal import MsalAuth -from microsoft.agents.builder import RestChannelServiceClientFactory, TurnContext +from microsoft.agents.hosting import RestChannelServiceClientFactory, TurnContext from microsoft.agents.storage import MemoryStorage load_dotenv() diff --git a/test_samples/app_style/mcs_agent.py b/test_samples/app_style/mcs_agent.py index ed3310be2..bc523e382 100644 --- a/test_samples/app_style/mcs_agent.py +++ b/test_samples/app_style/mcs_agent.py @@ -6,9 +6,9 @@ from typing import Optional from dotenv import load_dotenv -from microsoft.agents.builder.app import AgentApplication, TurnState, ConversationState -from microsoft.agents.builder.app.oauth import Authorization -from microsoft.agents.builder import TurnContext, MessageFactory +from microsoft.agents.hosting.app import AgentApplication, TurnState, ConversationState +from microsoft.agents.hosting.app.oauth import Authorization +from microsoft.agents.hosting import TurnContext, MessageFactory from microsoft.agents.storage import MemoryStorage from microsoft.agents.core.models import ActivityTypes, Activity from microsoft.agents.core import load_configuration_from_env diff --git a/test_samples/app_style/shared/start_server.py b/test_samples/app_style/shared/start_server.py index 2c5894320..17e8771d1 100644 --- a/test_samples/app_style/shared/start_server.py +++ b/test_samples/app_style/shared/start_server.py @@ -1,9 +1,8 @@ from os import environ -from microsoft.agents.authorization import AgentAuthConfiguration -from microsoft.agents.builder.app import AgentApplication +from microsoft.agents.hosting.authorization import AgentAuthConfiguration +from microsoft.agents.hosting.app import AgentApplication from microsoft.agents.hosting.aiohttp import ( jwt_authorization_middleware, - start_agent_process, CloudAdapter, ) from aiohttp.web import Request, Response, Application, run_app diff --git a/test_samples/app_style/streaming_agent.py b/test_samples/app_style/streaming_agent.py index 36b0ebd8a..86aae008e 100644 --- a/test_samples/app_style/streaming_agent.py +++ b/test_samples/app_style/streaming_agent.py @@ -8,12 +8,12 @@ import traceback from dotenv import load_dotenv -from microsoft.agents.builder.app import AgentApplication, TurnState -from microsoft.agents.builder.app.oauth import Authorization +from microsoft.agents.hosting.app import AgentApplication, TurnState +from microsoft.agents.hosting.app.oauth import Authorization from microsoft.agents.hosting.aiohttp import CloudAdapter, Citation from microsoft.agents.authentication.msal import MsalConnectionManager -from microsoft.agents.builder import ( +from microsoft.agents.hosting import ( TurnContext, MessageFactory, ) diff --git a/test_samples/empty_agent/app.py b/test_samples/empty_agent/app.py index 506ac0b10..4b360c3d7 100644 --- a/test_samples/empty_agent/app.py +++ b/test_samples/empty_agent/app.py @@ -4,9 +4,9 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.builder import RestChannelServiceClientFactory +from microsoft.agents.hosting import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/empty_agent/empty_agent.py b/test_samples/empty_agent/empty_agent.py index 259835795..c2988421c 100644 --- a/test_samples/empty_agent/empty_agent.py +++ b/test_samples/empty_agent/empty_agent.py @@ -1,4 +1,4 @@ -from microsoft.agents.builder import ActivityHandler, MessageFactory, TurnContext +from microsoft.agents.hosting import ActivityHandler, MessageFactory, TurnContext from microsoft.agents.core.models import ChannelAccount diff --git a/test_samples/teams_agent/app.py b/test_samples/teams_agent/app.py index 2dc050994..a5f340851 100644 --- a/test_samples/teams_agent/app.py +++ b/test_samples/teams_agent/app.py @@ -1,15 +1,14 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -import os import pathlib from dotenv import load_dotenv -from aiohttp.web import Application, Request, Response, run_app, static +from aiohttp.web import Application, Request, Response, run_app -from microsoft.agents.builder import RestChannelServiceClientFactory -from microsoft.agents.builder.state import UserState +from microsoft.agents.hosting import RestChannelServiceClientFactory +from microsoft.agents.hosting.state import UserState from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_decorator -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/teams_agent/helpers/task_module_response_factory.py b/test_samples/teams_agent/helpers/task_module_response_factory.py index 9a2011941..484e5e714 100644 --- a/test_samples/teams_agent/helpers/task_module_response_factory.py +++ b/test_samples/teams_agent/helpers/task_module_response_factory.py @@ -3,7 +3,7 @@ """Factory for creating task module responses.""" -from microsoft.agents.core.models.teams import ( +from microsoft.agents.core.teams import ( TaskModuleResponse, TaskModuleTaskInfo, TaskModuleResponseBase, diff --git a/test_samples/teams_agent/teams_handler.py b/test_samples/teams_agent/teams_handler.py index 9b4e32e0d..c840ea8b3 100644 --- a/test_samples/teams_agent/teams_handler.py +++ b/test_samples/teams_agent/teams_handler.py @@ -1,7 +1,7 @@ -from microsoft.agents.builder import MessageFactory, TurnContext +from microsoft.agents.hosting import MessageFactory, TurnContext from microsoft.agents.hosting.teams import TeamsActivityHandler, TeamsInfo from microsoft.agents.core.models import ChannelAccount, ConversationParameters -from microsoft.agents.core.models.teams import MeetingNotification +from microsoft.agents.core.teams import MeetingNotification class TeamsHandler(TeamsActivityHandler): diff --git a/test_samples/teams_agent/teams_multi_feature.py b/test_samples/teams_agent/teams_multi_feature.py index 413494fe3..4fc3f2bd8 100644 --- a/test_samples/teams_agent/teams_multi_feature.py +++ b/test_samples/teams_agent/teams_multi_feature.py @@ -1,9 +1,9 @@ import json from os import getenv -from microsoft.agents.builder import MessageFactory, TurnContext +from microsoft.agents.hosting import MessageFactory, TurnContext from microsoft.agents.core.models import ChannelAccount, Attachment -from microsoft.agents.core.models.teams import ( +from microsoft.agents.core.teams import ( TaskModuleResponse, TaskModuleTaskInfo, TaskModuleRequest, diff --git a/test_samples/teams_agent/teams_sso.py b/test_samples/teams_agent/teams_sso.py index b077a82b4..d337883a3 100644 --- a/test_samples/teams_agent/teams_sso.py +++ b/test_samples/teams_agent/teams_sso.py @@ -1,10 +1,10 @@ -from microsoft.agents.builder import ( +from microsoft.agents.hosting import ( ActivityHandler, OAuthFlow, MessageFactory, TurnContext, ) -from microsoft.agents.builder.state import UserState +from microsoft.agents.hosting.state import UserState from microsoft.agents.core.models import ChannelAccount from microsoft.agents.hosting.teams import TeamsActivityHandler, TeamsInfo diff --git a/test_samples/weather-agent-open-ai/app.py b/test_samples/weather-agent-open-ai/app.py index cb243d0a2..1c98027d6 100644 --- a/test_samples/weather-agent-open-ai/app.py +++ b/test_samples/weather-agent-open-ai/app.py @@ -1,14 +1,12 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -import os -from agents import set_tracing_export_api_key from dotenv import load_dotenv from aiohttp.web import Application, Request, Response, run_app -from microsoft.agents.builder import RestChannelServiceClientFactory +from microsoft.agents.hosting import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.authorization import ( +from microsoft.agents.hosting.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/weather-agent-open-ai/weather_agent.py b/test_samples/weather-agent-open-ai/weather_agent.py index 9c20156ec..bb6e631dc 100644 --- a/test_samples/weather-agent-open-ai/weather_agent.py +++ b/test_samples/weather-agent-open-ai/weather_agent.py @@ -1,7 +1,7 @@ from __future__ import annotations from typing import Union -from microsoft.agents.builder import ActivityHandler, MessageFactory, TurnContext +from microsoft.agents.hosting import ActivityHandler, MessageFactory, TurnContext from microsoft.agents.core.models import ChannelAccount, Attachment from agents import ( From 39fa8815220730c6097fd839c2f7725bc0d26756 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 21 Jul 2025 16:51:24 -0700 Subject: [PATCH 03/10] Restructuring and naming done. Exporting improvement pending. --- .azdo/ci-pr.yaml | 19 ++++-------- .flake8 | 2 -- .github/workflows/python-package.yml | 19 ++++-------- .../microsoft/__init__.py | 0 .../microsoft/agents/__init__.py | 0 .../activity/channel_adapter_protocol.py | 2 +- .../agents/activity/turn_context_protocol.py | 2 +- .../microsoft-agents-activity/pyproject.toml | 2 +- .../agents/authentication/msal/msal_auth.py | 4 +-- .../msal/msal_connection_manager.py | 2 +- .../pyproject.toml | 2 +- .../copilotstudio/client/copilot_client.py | 2 +- .../client/execute_turn_request.py | 2 +- .../pyproject.toml | 2 +- .../hosting/aiohttp/_start_agent_process.py | 2 +- .../hosting/aiohttp/agent_http_adapter.py | 2 +- .../aiohttp/app/streaming/citation_util.py | 2 +- .../app/streaming/streaming_response.py | 4 +-- .../aiohttp/channel_service_route_table.py | 4 +-- .../agents/hosting/aiohttp/cloud_adapter.py | 6 ++-- .../aiohttp/jwt_authorization_middleware.py | 2 +- .../pyproject.toml | 3 +- .../microsoft/agents/hosting/core/__init__.py | 29 +++++++++++++++++++ .../agents/hosting/core/activity_handler.py | 4 +-- .../hosting/core/app/agent_application.py | 6 ++-- .../agents/hosting/core/app/app_options.py | 4 +-- .../agents/hosting/core/app/input_file.py | 2 +- .../hosting/core/app/oauth/authorization.py | 8 ++--- .../agents/hosting/core/app/route.py | 2 +- .../core/app/state/conversation_state.py | 6 ++-- .../agents/hosting/core/app/state/state.py | 6 ++-- .../hosting/core/app/state/temp_state.py | 8 ++--- .../hosting/core/app/state/turn_state.py | 12 ++++---- .../hosting/core/app/typing_indicator.py | 4 +-- .../authorization/agent_auth_configuration.py | 2 +- .../agents/hosting/core/card_factory.py | 2 +- .../agents/hosting/core/channel_adapter.py | 8 ++--- .../core/channel_api_handler_protocol.py | 4 +-- .../hosting/core/channel_service_adapter.py | 6 ++-- .../channel_service_client_factory_base.py | 4 +-- .../client/agent_conversation_reference.py | 2 +- .../core/client/channel_factory_protocol.py | 2 +- .../hosting/core/client/channel_protocol.py | 2 +- .../core/client/configuration_channel_host.py | 2 +- .../core/client/conversation_id_factory.py | 4 +-- .../client/conversation_id_factory_options.py | 2 +- .../hosting/core/client/http_agent_channel.py | 4 +-- .../core/client/http_agent_channel_factory.py | 2 +- .../core/connector/agent_sign_in_base.py | 2 +- .../core/connector/attachments_base.py | 2 +- .../core/connector/client/connector_client.py | 4 +-- .../connector/client/user_token_client.py | 4 +-- .../core/connector/conversations_base.py | 2 +- .../connector/teams/teams_connector_client.py | 10 +++---- .../hosting/core/connector/user_token_base.py | 2 +- .../agents/hosting/core/message_factory.py | 2 +- .../agents/hosting/core/oauth_flow.py | 8 ++--- .../rest_channel_service_client_factory.py | 10 +++---- .../agents/hosting/core/state/agent_state.py | 2 +- .../core/state/state_property_accessor.py | 2 +- .../agents/hosting/core/state/user_state.py | 2 +- .../agents/hosting/core/turn_context.py | 4 +-- .../pyproject.toml | 4 +-- .../tests/test_activity_handler.py | 4 +-- .../tests/test_agent_state.py | 12 ++++---- .../tests/test_error_handling.py | 2 +- .../tests/test_memory_storage.py | 4 +-- .../tests/test_state.py | 6 ++-- .../tests/test_turn_context.py | 4 +-- .../tests/test_utils.py | 2 +- .../tests/tools/testing_adapter.py | 10 +++---- .../tests/tools/testing_flow.py | 2 +- .../tests/tools/testing_utility.py | 4 +-- .../hosting/teams/teams_activity_handler.py | 6 ++-- .../agents/hosting/teams/teams_info.py | 8 ++--- .../pyproject.toml | 3 +- .../microsoft/agents/blob/__init__.py | 10 ------- .../microsoft/agents/storage/blob/__init__.py | 4 +++ .../agents/{ => storage}/blob/blob_storage.py | 8 ++--- .../{ => storage}/blob/blob_storage_config.py | 0 .../pyproject.toml | 4 +-- .../tests/test_blob_storage.py | 4 +-- test_samples/agent_to_agent/agent_1/agent1.py | 10 +++---- test_samples/agent_to_agent/agent_1/app.py | 8 ++--- test_samples/agent_to_agent/agent_1/config.py | 2 +- test_samples/agent_to_agent/agent_2/agent2.py | 4 +-- test_samples/agent_to_agent/agent_2/app.py | 4 +-- test_samples/app_style/authorization_agent.py | 12 ++++---- test_samples/app_style/emtpy_agent.py | 8 ++--- test_samples/app_style/mcs_agent.py | 12 ++++---- test_samples/app_style/shared/start_server.py | 4 +-- test_samples/app_style/streaming_agent.py | 12 ++++---- .../chat_console_service.py | 2 +- test_samples/empty_agent/app.py | 4 +-- test_samples/empty_agent/empty_agent.py | 4 +-- test_samples/teams_agent/app.py | 8 ++--- .../helpers/task_module_response_factory.py | 2 +- test_samples/teams_agent/teams_handler.py | 6 ++-- .../teams_agent/teams_multi_feature.py | 6 ++-- test_samples/teams_agent/teams_sso.py | 6 ++-- test_samples/weather-agent-open-ai/app.py | 4 +-- .../weather-agent-open-ai/weather_agent.py | 4 +-- 102 files changed, 253 insertions(+), 248 deletions(-) delete mode 100644 libraries/microsoft-agents-activity/microsoft/__init__.py delete mode 100644 libraries/microsoft-agents-activity/microsoft/agents/__init__.py delete mode 100644 libraries/microsoft-agents-storage-blob/microsoft/agents/blob/__init__.py create mode 100644 libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/__init__.py rename libraries/microsoft-agents-storage-blob/microsoft/agents/{ => storage}/blob/blob_storage.py (91%) rename libraries/microsoft-agents-storage-blob/microsoft/agents/{ => storage}/blob/blob_storage_config.py (100%) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index 64742e941..b2adf786d 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -37,27 +37,20 @@ steps: - script: | mkdir -p dist for dir in libraries/*; do - if [ -d "$dir" ]; then - for subdir in "$dir"/*; do - if [ -f "$subdir/pyproject.toml" ]; then - (cd "$subdir" && python -m build --outdir ../../../dist) - fi - done + if [ -f "$dir/pyproject.toml" ]; then + (cd "$dir" && python -m build --outdir ../../../dist) fi done displayName: 'Build packages' - script: | - python -m pip install ./dist/microsoft_agents_core*.whl - python -m pip install ./dist/microsoft_agents_authorization*.whl - python -m pip install ./dist/microsoft_agents_connector*.whl - python -m pip install ./dist/microsoft_agents_client*.whl - python -m pip install ./dist/microsoft_agents_builder*.whl + python -m pip install ./dist/microsoft_agents_activity*.whl + python -m pip install ./dist/microsoft_agents_hosting_core*.whl python -m pip install ./dist/microsoft_agents_authentication_msal*.whl python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl - python -m pip install ./dist/microsoft_agents_storage*.whl - python -m pip install ./dist/microsoft_agents_blob*.whl + python -m pip install ./dist/microsoft_agents_hosting_teams*.whl + python -m pip install ./dist/microsoft_agents_storage_blob*.whl displayName: 'Install wheels' - script: | diff --git a/.flake8 b/.flake8 index 334aae3ab..46c64748b 100644 --- a/.flake8 +++ b/.flake8 @@ -1,8 +1,6 @@ [flake8] max-line-length = 127 max-complexity = 10 -per-file-ignores = - libraries/Core/Protocols/microsoft-agents-protocols/microsoft/agents/protocols/connector/*: C901, E722 exclude = migrations __pycache__ diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 5e0b070fa..c95084694 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -44,26 +44,19 @@ jobs: run: | mkdir -p dist for dir in libraries/*; do - if [ -d "$dir" ]; then - for subdir in "$dir"/*; do - if [ -f "$subdir/pyproject.toml" ]; then - (cd "$subdir" && python -m build --outdir ../../../dist) - fi - done + if [ -f "$dir/pyproject.toml" ]; then + (cd "$dir" && python -m build --outdir ../../dist) fi done - name: Install wheels run: | - python -m pip install ./dist/microsoft_agents_core*.whl - python -m pip install ./dist/microsoft_agents_authorization*.whl - python -m pip install ./dist/microsoft_agents_connector*.whl - python -m pip install ./dist/microsoft_agents_client*.whl - python -m pip install ./dist/microsoft_agents_builder*.whl + python -m pip install ./dist/microsoft_agents_activity*.whl + python -m pip install ./dist/microsoft_agents_hosting_core*.whl python -m pip install ./dist/microsoft_agents_authentication_msal*.whl python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl - python -m pip install ./dist/microsoft_agents_storage*.whl - python -m pip install ./dist/microsoft_agents_blob*.whl + python -m pip install ./dist/microsoft_agents_hosting_teams*.whl + python -m pip install ./dist/microsoft_agents_storage_blob*.whl - name: Test with pytest run: | pytest diff --git a/libraries/microsoft-agents-activity/microsoft/__init__.py b/libraries/microsoft-agents-activity/microsoft/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/libraries/microsoft-agents-activity/microsoft/agents/__init__.py b/libraries/microsoft-agents-activity/microsoft/agents/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py index 4734b8c50..79906b30b 100644 --- a/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py +++ b/libraries/microsoft-agents-activity/microsoft/agents/activity/channel_adapter_protocol.py @@ -2,7 +2,7 @@ from typing import Protocol, List, Callable, Awaitable, Optional from .turn_context_protocol import TurnContextProtocol -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, ResourceResponse, ConversationReference, diff --git a/libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py b/libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py index 965a5ccb2..7052b3777 100644 --- a/libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py +++ b/libraries/microsoft-agents-activity/microsoft/agents/activity/turn_context_protocol.py @@ -3,7 +3,7 @@ from typing import Protocol, List, Callable, Optional, Generic, TypeVar from abc import abstractmethod -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, ResourceResponse, ConversationReference, diff --git a/libraries/microsoft-agents-activity/pyproject.toml b/libraries/microsoft-agents-activity/pyproject.toml index 83b4f67f9..20f97e6c1 100644 --- a/libraries/microsoft-agents-activity/pyproject.toml +++ b/libraries/microsoft-agents-activity/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] -name = "microsoft-agents-core" +name = "microsoft-agents-activity" version = "0.0.0a1" description = "A protocol library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] diff --git a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py index eafc40fb1..6176f215c 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py @@ -13,12 +13,12 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( AccessTokenProviderBase, AgentAuthConfiguration, ) -from microsoft.agents.hosting.authorization import AuthTypes +from microsoft.agents.hosting.core.authorization import AuthTypes class MsalAuth(AccessTokenProviderBase): diff --git a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py index 472240ff2..591240d68 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py @@ -1,5 +1,5 @@ from typing import Dict, List, Optional -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( AgentAuthConfiguration, AccessTokenProviderBase, ClaimsIdentity, diff --git a/libraries/microsoft-agents-authentication-msal/pyproject.toml b/libraries/microsoft-agents-authentication-msal/pyproject.toml index 223a1f1d8..1d822b3f6 100644 --- a/libraries/microsoft-agents-authentication-msal/pyproject.toml +++ b/libraries/microsoft-agents-authentication-msal/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "microsoft-agents-authorization", + "microsoft-agents-hosting-core", "msal>=1.31.1", "requests>=2.32.3", "cryptography>=44.0.0", diff --git a/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py index 392af90d1..d162a0c95 100644 --- a/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py +++ b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/copilot_client.py @@ -1,7 +1,7 @@ import aiohttp from typing import AsyncIterable, Callable, Optional -from microsoft.agents.core.models import Activity, ActivityTypes, ConversationAccount +from microsoft.agents.activity import Activity, ActivityTypes, ConversationAccount from .connection_settings import ConnectionSettings from .execute_turn_request import ExecuteTurnRequest diff --git a/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py index 981e3c06d..54455dbfd 100644 --- a/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py +++ b/libraries/microsoft-agents-copilotstudio-client/microsoft/agents/copilotstudio/client/execute_turn_request.py @@ -1,4 +1,4 @@ -from microsoft.agents.core.models import AgentsModel, Activity +from microsoft.agents.activity import AgentsModel, Activity class ExecuteTurnRequest(AgentsModel): diff --git a/libraries/microsoft-agents-copilotstudio-client/pyproject.toml b/libraries/microsoft-agents-copilotstudio-client/pyproject.toml index 64f848c5b..242cad3bf 100644 --- a/libraries/microsoft-agents-copilotstudio-client/pyproject.toml +++ b/libraries/microsoft-agents-copilotstudio-client/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "microsoft-agents-core", + "microsoft-agents-hosting-core", ] [project.urls] diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py index 227955ebf..dd30a73df 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/_start_agent_process.py @@ -1,6 +1,6 @@ from typing import Optional from aiohttp.web import Request, Response -from microsoft.agents.hosting.app import AgentApplication +from microsoft.agents.hosting.core.app import AgentApplication from .cloud_adapter import CloudAdapter diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py index 6be005815..c6a5e8d7b 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/agent_http_adapter.py @@ -9,7 +9,7 @@ Response, ) -from microsoft.agents.hosting import Agent +from microsoft.agents.hosting.core import Agent class AgentHttpAdapter(Protocol): diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py index b13ca5982..00c2c5956 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/citation_util.py @@ -4,7 +4,7 @@ import re from typing import List, Optional -from microsoft.agents.core.models import ClientCitation +from microsoft.agents.activity import ClientCitation class CitationUtil: diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py index 9b2b05aac..be6e5cc8f 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/app/streaming/streaming_response.py @@ -6,7 +6,7 @@ from typing import List, Optional, Callable, Literal, TYPE_CHECKING from dataclasses import dataclass -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, Entity, Attachment, @@ -18,7 +18,7 @@ ) if TYPE_CHECKING: - from microsoft.agents.hosting.turn_context import TurnContext + from microsoft.agents.hosting.core.turn_context import TurnContext from .citation import Citation from .citation_util import CitationUtil diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py index 6a87612b8..6f7c536ea 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/channel_service_route_table.py @@ -5,14 +5,14 @@ from aiohttp.web import RouteTableDef, Request, Response -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( AgentsModel, Activity, AttachmentData, ConversationParameters, Transcript, ) -from microsoft.agents.hosting import ChannelApiHandlerProtocol +from microsoft.agents.hosting.core import ChannelApiHandlerProtocol async def deserialize_from_body( diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py index 4b86bfb35..d000dd4fa 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/cloud_adapter.py @@ -12,15 +12,15 @@ HTTPUnauthorized, HTTPUnsupportedMediaType, ) -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( ClaimsIdentity, Connections, ) -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, DeliveryModes, ) -from microsoft.agents.hosting import ( +from microsoft.agents.hosting.core import ( Agent, ChannelServiceAdapter, ChannelServiceClientFactoryBase, diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py index fab6d5735..3c2679025 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py @@ -1,7 +1,7 @@ import functools from aiohttp.web import Request, middleware, json_response -from microsoft.agents.hosting.authorization import AgentAuthConfiguration, JwtTokenValidator +from microsoft.agents.hosting.core.authorization import AgentAuthConfiguration, JwtTokenValidator @middleware diff --git a/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml index 31ca0d103..00173cf99 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml +++ b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml @@ -14,8 +14,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "microsoft-agents-connector", - "microsoft-agents-hosting", + "microsoft-agents-hosting-core", "aiohttp>=3.11.11", ] diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py index e69de29bb..c7bb88032 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py @@ -0,0 +1,29 @@ +# Import necessary modules +from .activity_handler import ActivityHandler +from .agent import Agent +from .oauth_flow import OAuthFlow +from .card_factory import CardFactory +from .channel_adapter import ChannelAdapter +from .channel_api_handler_protocol import ChannelApiHandlerProtocol +from .channel_service_adapter import ChannelServiceAdapter +from .channel_service_client_factory_base import ChannelServiceClientFactoryBase +from .message_factory import MessageFactory +from .middleware_set import Middleware +from .rest_channel_service_client_factory import RestChannelServiceClientFactory +from .turn_context import TurnContext + +# Define the package's public interface +__all__ = [ + "ActivityHandler", + "Agent", + "OAuthFlow", + "CardFactory", + "ChannelAdapter", + "ChannelApiHandlerProtocol", + "ChannelServiceAdapter", + "ChannelServiceClientFactoryBase", + "MessageFactory", + "Middleware", + "RestChannelServiceClientFactory", + "TurnContext", +] \ No newline at end of file diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py index f11763988..96a949d47 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/activity_handler.py @@ -4,8 +4,8 @@ from http import HTTPStatus from pydantic import BaseModel -from microsoft.agents.core import TurnContextProtocol -from microsoft.agents.core.models import ( +from microsoft.agents.activity import TurnContextProtocol +from microsoft.agents.activity import ( Activity, ActivityTypes, AdaptiveCardInvokeResponse, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py index 85ff67dc7..4d4e209f8 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/agent_application.py @@ -22,10 +22,10 @@ cast, ) -from microsoft.agents.hosting.authorization import Connections +from microsoft.agents.hosting.core.authorization import Connections -from microsoft.agents.hosting import Agent, TurnContext -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core import Agent, TurnContext +from microsoft.agents.activity import ( Activity, ActivityTypes, ConversationUpdateTypes, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py index c8ffd7e2d..dcb696ec3 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/app_options.py @@ -9,8 +9,8 @@ from logging import Logger from typing import Callable, List, Optional -from microsoft.agents.hosting.app.oauth.authorization import AuthorizationHandlers -from microsoft.agents.storage import Storage +from microsoft.agents.hosting.core.app.oauth.authorization import AuthorizationHandlers +from microsoft.agents.hosting.core.storage import Storage # from .auth import AuthOptions from .input_file import InputFileDownloader diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py index 5182fadc2..859cdeec5 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/input_file.py @@ -9,7 +9,7 @@ from dataclasses import dataclass from typing import List, Optional -from microsoft.agents.hosting import TurnContext +from microsoft.agents.hosting.core import TurnContext @dataclass diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py index 446fcea7f..5c5004193 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py @@ -5,10 +5,10 @@ import jwt from typing import Dict, Optional, Callable, Awaitable -from microsoft.agents.hosting.authorization import Connections, AccessTokenProviderBase -from microsoft.agents.storage import Storage -from microsoft.agents.core.models import TokenResponse, Activity -from microsoft.agents.storage import StoreItem +from microsoft.agents.hosting.core.authorization import Connections, AccessTokenProviderBase +from microsoft.agents.hosting.core.storage import Storage +from microsoft.agents.activity import TokenResponse, Activity +from microsoft.agents.hosting.core.storage import StoreItem from pydantic import BaseModel from ...turn_context import TurnContext diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py index 272d5df61..7eae71d63 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/route.py @@ -7,7 +7,7 @@ from typing import Awaitable, Callable, Generic, List, TypeVar -from microsoft.agents.hosting import TurnContext +from microsoft.agents.hosting.core import TurnContext from .state import TurnState StateT = TypeVar("StateT", bound=TurnState) diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py index 421b0ea2f..6c44b1bdf 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/conversation_state.py @@ -7,10 +7,10 @@ from typing import Type -from microsoft.agents.storage import Storage, StoreItem +from microsoft.agents.hosting.core.storage import Storage, StoreItem -from microsoft.agents.hosting.turn_context import TurnContext -from microsoft.agents.hosting.state import AgentState +from microsoft.agents.hosting.core.turn_context import TurnContext +from microsoft.agents.hosting.core.state import AgentState class ConversationState(AgentState): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py index a370c0a09..b890f23d2 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/state.py @@ -10,12 +10,12 @@ from copy import deepcopy from typing import Any, Callable, List, Optional, Type, TypeVar, Union, overload -from microsoft.agents.hosting.state.state_property_accessor import ( +from microsoft.agents.hosting.core.state.state_property_accessor import ( StatePropertyAccessor as _StatePropertyAccessor, ) -from microsoft.agents.storage import Storage, StoreItem +from microsoft.agents.hosting.core.storage import Storage, StoreItem -from microsoft.agents.hosting.turn_context import TurnContext +from microsoft.agents.hosting.core.turn_context import TurnContext T = TypeVar("T") diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py index 4aa024bff..b32ae3cb1 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/temp_state.py @@ -7,11 +7,11 @@ from typing import Dict, List, Optional, TypeVar, Callable, Any, Generic -from microsoft.agents.storage import Storage +from microsoft.agents.hosting.core.storage import Storage -from microsoft.agents.hosting.turn_context import TurnContext -from microsoft.agents.hosting.app.input_file import InputFile -from microsoft.agents.hosting.state import AgentState +from microsoft.agents.hosting.core.turn_context import TurnContext +from microsoft.agents.hosting.core.app.input_file import InputFile +from microsoft.agents.hosting.core.state import AgentState T = TypeVar("T") diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py index 6fbd859a5..bff8a5c27 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/state/turn_state.py @@ -8,13 +8,13 @@ from typing import Any, Dict, Optional, Type, TypeVar, cast, Callable, Awaitable import asyncio -from microsoft.agents.storage import Storage +from microsoft.agents.hosting.core.storage import Storage -from microsoft.agents.hosting.turn_context import TurnContext -from microsoft.agents.hosting.app.state.conversation_state import ConversationState -from microsoft.agents.hosting.state import AgentState -from microsoft.agents.hosting.app.state.temp_state import TempState -from microsoft.agents.hosting.state.user_state import UserState +from microsoft.agents.hosting.core.turn_context import TurnContext +from microsoft.agents.hosting.core.app.state.conversation_state import ConversationState +from microsoft.agents.hosting.core.state import AgentState +from microsoft.agents.hosting.core.app.state.temp_state import TempState +from microsoft.agents.hosting.core.state.user_state import UserState ConversationStateT = TypeVar("ConversationStateT", bound=ConversationState) UserStateT = TypeVar("UserStateT", bound=UserState) diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py index abcd931fb..82f8bc789 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/typing_indicator.py @@ -8,8 +8,8 @@ from threading import Timer from typing import Optional -from microsoft.agents.hosting import TurnContext -from microsoft.agents.core.models import Activity, ActivityTypes +from microsoft.agents.hosting.core import TurnContext +from microsoft.agents.activity import Activity, ActivityTypes class TypingIndicator: diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py index ec4600534..6086122bb 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/agent_auth_configuration.py @@ -1,6 +1,6 @@ from typing import Optional -from microsoft.agents.hosting.authorization.auth_types import AuthTypes +from microsoft.agents.hosting.core.authorization.auth_types import AuthTypes class AgentAuthConfiguration: diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/card_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/card_factory.py index d8befe094..f218f1502 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/card_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/card_factory.py @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( AnimationCard, Attachment, AudioCard, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py index 12972cd5e..14efd136f 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_adapter.py @@ -4,9 +4,9 @@ from abc import ABC, abstractmethod from collections.abc import Callable from typing import List, Awaitable -from microsoft.agents.hosting.authorization import ClaimsIdentity -from microsoft.agents.core import ChannelAdapterProtocol -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core.authorization import ClaimsIdentity +from microsoft.agents.activity import ChannelAdapterProtocol +from microsoft.agents.activity import ( Activity, ConversationAccount, ConversationReference, @@ -173,7 +173,7 @@ async def create_conversation( If the conversation is established with the specified users, the ID of the activity will contain the ID of the new conversation. """ - from microsoft.agents.core.models import ActivityTypes + from microsoft.agents.activity import ActivityTypes # If credentials are not provided, we can't create a conversation if not conversation_parameters: diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py index ce6288e9b..8c1455f8e 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_api_handler_protocol.py @@ -1,7 +1,7 @@ from abc import abstractmethod from typing import Protocol, Optional -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, AttachmentData, ChannelAccount, @@ -13,7 +13,7 @@ Transcript, ) -from microsoft.agents.hosting.authorization import ClaimsIdentity +from microsoft.agents.hosting.core.authorization import ClaimsIdentity class ChannelApiHandlerProtocol(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py index 57b146a20..7488e32f1 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py @@ -10,7 +10,7 @@ from typing import Awaitable, Callable, cast from uuid import uuid4 -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, ActivityEventNames, ActivityTypes, @@ -25,13 +25,13 @@ InvokeResponse, ResourceResponse, ) -from microsoft.agents.hosting.connector import ( +from microsoft.agents.hosting.core.connector import ( ConnectorClientBase, UserTokenClientBase, ConnectorClient, UserTokenClient, ) -from microsoft.agents.hosting.authorization import AuthenticationConstants, ClaimsIdentity +from microsoft.agents.hosting.core.authorization import AuthenticationConstants, ClaimsIdentity from .channel_service_client_factory_base import ChannelServiceClientFactoryBase from .channel_adapter import ChannelAdapter from .turn_context import TurnContext diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py index 839370c42..61ad052e7 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py @@ -1,8 +1,8 @@ from typing import Protocol, Optional from abc import abstractmethod -from microsoft.agents.hosting.authorization import ClaimsIdentity -from microsoft.agents.hosting.connector import ConnectorClientBase, UserTokenClientBase +from microsoft.agents.hosting.core.authorization import ClaimsIdentity +from microsoft.agents.hosting.core.connector import ConnectorClientBase, UserTokenClientBase class ChannelServiceClientFactoryBase(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/agent_conversation_reference.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/agent_conversation_reference.py index 6ecf7bb21..406cf4d82 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/agent_conversation_reference.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/agent_conversation_reference.py @@ -1,4 +1,4 @@ -from microsoft.agents.core.models import AgentsModel, ConversationReference +from microsoft.agents.activity import AgentsModel, ConversationReference class AgentConversationReference(AgentsModel): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py index 6b30f3c4e..c9eeec200 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_factory_protocol.py @@ -1,6 +1,6 @@ from typing import Protocol -from microsoft.agents.hosting.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.core.authorization import AccessTokenProviderBase from .channel_protocol import ChannelProtocol diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_protocol.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_protocol.py index 693afb36d..4a60ec815 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_protocol.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/channel_protocol.py @@ -1,6 +1,6 @@ from typing import Protocol -from microsoft.agents.core.models import AgentsModel, Activity, InvokeResponse +from microsoft.agents.activity import AgentsModel, Activity, InvokeResponse class ChannelProtocol(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py index 9126130df..67017f7e8 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/configuration_channel_host.py @@ -1,6 +1,6 @@ from copy import copy -from microsoft.agents.hosting.authorization import Connections +from microsoft.agents.hosting.core.authorization import Connections from .channels_configuration import ChannelsConfiguration from .channel_factory_protocol import ChannelFactoryProtocol diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory.py index 63c98fb59..89a79fd03 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory.py @@ -2,8 +2,8 @@ from functools import partial from typing import Type -from microsoft.agents.core.models import AgentsModel -from microsoft.agents.storage import Storage, StoreItem +from microsoft.agents.activity import AgentsModel +from microsoft.agents.hosting.core.storage import Storage, StoreItem from .agent_conversation_reference import AgentConversationReference from .conversation_id_factory_protocol import ConversationIdFactoryProtocol diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_options.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_options.py index 25350c4b2..bfbfee0c7 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_options.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/conversation_id_factory_options.py @@ -1,4 +1,4 @@ -from microsoft.agents.core.models import Activity +from microsoft.agents.activity import Activity from .channel_info_protocol import ChannelInfoProtocol diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py index d2567abe5..5f138b853 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel.py @@ -1,8 +1,8 @@ from copy import deepcopy, copy from aiohttp import ClientSession -from microsoft.agents.hosting.authorization import AccessTokenProviderBase -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core.authorization import AccessTokenProviderBase +from microsoft.agents.activity import ( AgentsModel, Activity, ConversationReference, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py index 353c34a74..95fe928f8 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/client/http_agent_channel_factory.py @@ -1,4 +1,4 @@ -from microsoft.agents.hosting.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.core.authorization import AccessTokenProviderBase from .channel_factory_protocol import ChannelFactoryProtocol from .channel_protocol import ChannelProtocol diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/agent_sign_in_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/agent_sign_in_base.py index b9ef10d95..222cb560e 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/agent_sign_in_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/agent_sign_in_base.py @@ -1,7 +1,7 @@ from abc import abstractmethod from typing import Protocol -from microsoft.agents.core.models import SignInResource +from microsoft.agents.activity import SignInResource class AgentSignInBase(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/attachments_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/attachments_base.py index a53dcadee..62eb9b583 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/attachments_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/attachments_base.py @@ -4,7 +4,7 @@ from abc import abstractmethod from typing import AsyncIterator, Optional, Protocol -from microsoft.agents.core.models import AttachmentInfo +from microsoft.agents.activity import AttachmentInfo class AttachmentsBase(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py index 976b377d9..d3f976a63 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/connector_client.py @@ -8,7 +8,7 @@ from aiohttp import ClientSession from io import BytesIO -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, ChannelAccount, ConversationParameters, @@ -17,7 +17,7 @@ ConversationsResult, PagedMembersResult, ) -from microsoft.agents.hosting.connector import ConnectorClientBase +from microsoft.agents.hosting.core.connector import ConnectorClientBase from ..attachments_base import AttachmentsBase from ..conversations_base import ConversationsBase from ..get_product_info import get_product_info diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py index 422c0e3dc..ae5b003a1 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/client/user_token_client.py @@ -7,8 +7,8 @@ from typing import Optional from aiohttp import ClientSession -from microsoft.agents.hosting.connector import UserTokenClientBase -from microsoft.agents.core.models import TokenResponse, TokenStatus, SignInResource +from microsoft.agents.hosting.core.connector import UserTokenClientBase +from microsoft.agents.activity import TokenResponse, TokenStatus, SignInResource from ..get_product_info import get_product_info from ..user_token_base import UserTokenBase from ..agent_sign_in_base import AgentSignInBase diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/conversations_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/conversations_base.py index f25c50f43..2b27caef9 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/conversations_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/conversations_base.py @@ -4,7 +4,7 @@ from abc import abstractmethod from typing import Protocol, Optional -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( AttachmentInfo, ConversationResourceResponse, ConversationsResult, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py index e73d55876..8fb3110a5 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/teams/teams_connector_client.py @@ -6,15 +6,15 @@ from typing import Any from aiohttp import ClientSession -from microsoft.agents.core.models import Activity, ResourceResponse -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.activity import Activity, ResourceResponse +from microsoft.agents.hosting.core.authorization import ( AccessTokenProviderBase, AgentAuthConfiguration, ) -from microsoft.agents.hosting.connector.client import ConnectorClient +from microsoft.agents.hosting.core.connector.client import ConnectorClient -from microsoft.agents.core.models import ConversationParameters -from microsoft.agents.core.teams import ( +from microsoft.agents.activity import ConversationParameters +from microsoft.agents.activity.teams import ( TeamsChannelAccount, TeamsPagedMembersResult, TeamDetails, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_base.py index 45957bfa3..28e949877 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/user_token_base.py @@ -1,7 +1,7 @@ from abc import abstractmethod from typing import Protocol -from microsoft.agents.core.models import TokenResponse, TokenStatus +from microsoft.agents.activity import TokenResponse, TokenStatus class UserTokenBase(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/message_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/message_factory.py index bfafa4919..4188e73a2 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/message_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/message_factory.py @@ -3,7 +3,7 @@ from __future__ import annotations -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( ActivityTypes, Activity, Attachment, diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py index a7502ed84..c9deeda71 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/oauth_flow.py @@ -6,8 +6,8 @@ from datetime import datetime from typing import Dict, Optional -from microsoft.agents.hosting.connector.client import UserTokenClient -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core.connector.client import UserTokenClient +from microsoft.agents.activity import ( ActionTypes, ActivityTypes, CardAction, @@ -17,10 +17,10 @@ TokenResponse, Activity, ) -from microsoft.agents.core import ( +from microsoft.agents.activity import ( TurnContextProtocol as TurnContext, ) -from microsoft.agents.storage import StoreItem, Storage +from microsoft.agents.hosting.core.storage import StoreItem, Storage from pydantic import BaseModel from .message_factory import MessageFactory diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py index 0adef9521..10f35e706 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/rest_channel_service_client_factory.py @@ -1,15 +1,15 @@ from typing import Optional -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( AuthenticationConstants, AnonymousTokenProvider, ClaimsIdentity, Connections, ) -from microsoft.agents.hosting.authorization import AccessTokenProviderBase -from microsoft.agents.hosting.connector import ConnectorClientBase -from microsoft.agents.hosting.connector.client import UserTokenClient -from microsoft.agents.hosting.connector.teams import TeamsConnectorClient +from microsoft.agents.hosting.core.authorization import AccessTokenProviderBase +from microsoft.agents.hosting.core.connector import ConnectorClientBase +from microsoft.agents.hosting.core.connector.client import UserTokenClient +from microsoft.agents.hosting.core.connector.teams import TeamsConnectorClient from .channel_service_client_factory_base import ChannelServiceClientFactoryBase diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py index dc2b8d51f..d0056552c 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/agent_state.py @@ -7,7 +7,7 @@ from copy import deepcopy from typing import Callable, Dict, Union, Type -from microsoft.agents.storage import Storage, StoreItem +from microsoft.agents.hosting.core.storage import Storage, StoreItem from .state_property_accessor import StatePropertyAccessor from ..turn_context import TurnContext diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/state_property_accessor.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/state_property_accessor.py index ed5c5170c..f90d7a38e 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/state_property_accessor.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/state_property_accessor.py @@ -5,7 +5,7 @@ from collections.abc import Callable from typing import Protocol, Type, Union -from microsoft.agents.storage import StoreItem +from microsoft.agents.hosting.core.storage import StoreItem from ..turn_context import TurnContext diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/user_state.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/user_state.py index 4da2e722d..151cb1fec 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/user_state.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/state/user_state.py @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -from microsoft.agents.storage import Storage +from microsoft.agents.hosting.core.storage import Storage from ..turn_context import TurnContext from .agent_state import AgentState diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/turn_context.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/turn_context.py index 66c796006..5dc1b656a 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/turn_context.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/turn_context.py @@ -7,8 +7,8 @@ from copy import copy, deepcopy from collections.abc import Callable from datetime import datetime, timezone -from microsoft.agents.core import TurnContextProtocol -from microsoft.agents.core.models import ( +from microsoft.agents.activity import TurnContextProtocol +from microsoft.agents.activity import ( Activity, ActivityTypes, ConversationReference, diff --git a/libraries/microsoft-agents-hosting-core/pyproject.toml b/libraries/microsoft-agents-hosting-core/pyproject.toml index 7ac1726ed..9bb3ff77e 100644 --- a/libraries/microsoft-agents-hosting-core/pyproject.toml +++ b/libraries/microsoft-agents-hosting-core/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] -name = "microsoft-agents-hosting" +name = "microsoft-agents-hosting-core" version = "0.0.0a1" description = "A protocol library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] @@ -17,7 +17,7 @@ dependencies = [ "pyjwt>=2.10.1", "isodate>=0.6.1", "azure-core>=1.30.0", - "microsoft-agents-core", + "microsoft-agents-activity", "python-dotenv>=1.1.1", ] diff --git a/libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py b/libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py index 294aef39b..fa1026567 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_activity_handler.py @@ -1,7 +1,7 @@ import pytest from unittest.mock import AsyncMock -from microsoft.agents.hosting import ActivityHandler, TurnContext -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core import ActivityHandler, TurnContext +from microsoft.agents.activity import ( ActivityTypes, ChannelAccount, MessageReaction, diff --git a/libraries/microsoft-agents-hosting-core/tests/test_agent_state.py b/libraries/microsoft-agents-hosting-core/tests/test_agent_state.py index 11e8a29b2..d83cc2bc5 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_agent_state.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_agent_state.py @@ -10,16 +10,16 @@ from typing import Type from unittest.mock import AsyncMock, MagicMock -from microsoft.agents.hosting.state.agent_state import ( +from microsoft.agents.hosting.core.state.agent_state import ( AgentState, CachedAgentState, BotStatePropertyAccessor, ) -from microsoft.agents.hosting.state.user_state import UserState -from microsoft.agents.hosting.app.state.conversation_state import ConversationState -from microsoft.agents.hosting.turn_context import TurnContext -from microsoft.agents.storage import Storage, StoreItem, MemoryStorage -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core.state.user_state import UserState +from microsoft.agents.hosting.core.app.state.conversation_state import ConversationState +from microsoft.agents.hosting.core.turn_context import TurnContext +from microsoft.agents.hosting.core.storage import Storage, StoreItem, MemoryStorage +from microsoft.agents.activity import ( Activity, ActivityTypes, ChannelAccount, diff --git a/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py b/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py index bb644c67b..953f9a5ad 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py @@ -1,5 +1,5 @@ import pytest -from microsoft.agents.storage.error_handling import ignore_error, is_status_code_error +from microsoft.agents.hosting.core.storage.error_handling import ignore_error, is_status_code_error class CustomError(Exception): diff --git a/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py b/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py index f7b59aa11..c80742366 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py @@ -1,5 +1,5 @@ -from microsoft.agents.storage.memory_storage import MemoryStorage -from microsoft.agents.storage.storage_test_utils import CRUDStorageTests, StorageMock +from microsoft.agents.hosting.core.storage.memory_storage import MemoryStorage +from microsoft.agents.hosting.core.storage.storage_test_utils import CRUDStorageTests, StorageMock class MemoryStorageMock(StorageMock): diff --git a/libraries/microsoft-agents-hosting-core/tests/test_state.py b/libraries/microsoft-agents-hosting-core/tests/test_state.py index 7bc92adce..d040f3b51 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_state.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_state.py @@ -7,9 +7,9 @@ import pytest from unittest.mock import AsyncMock, MagicMock -from microsoft.agents.hosting.app.state.state import State, state, StatePropertyAccessor -from microsoft.agents.hosting.turn_context import TurnContext -from microsoft.agents.storage import Storage, StoreItem +from microsoft.agents.hosting.core.app.state.state import State, state, StatePropertyAccessor +from microsoft.agents.hosting.core.turn_context import TurnContext +from microsoft.agents.hosting.core.storage import Storage, StoreItem class MockStoreItem(StoreItem): diff --git a/libraries/microsoft-agents-hosting-core/tests/test_turn_context.py b/libraries/microsoft-agents-hosting-core/tests/test_turn_context.py index 3eab30d65..073a61d85 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_turn_context.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_turn_context.py @@ -1,7 +1,7 @@ import pytest from typing import Callable, List -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, ActivityTypes, ChannelAccount, @@ -10,7 +10,7 @@ Mention, ResourceResponse, ) -from microsoft.agents.hosting import ChannelAdapter, MessageFactory, TurnContext +from microsoft.agents.hosting.core import ChannelAdapter, MessageFactory, TurnContext activity_data = { "type": "message", diff --git a/libraries/microsoft-agents-hosting-core/tests/test_utils.py b/libraries/microsoft-agents-hosting-core/tests/test_utils.py index 3ea0b83fa..e0f9f78de 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_utils.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_utils.py @@ -1,4 +1,4 @@ -from microsoft.agents.storage.storage_test_utils import ( +from microsoft.agents.hosting.core.storage.storage_test_utils import ( MockStoreItem, MockStoreItemB, my_deepcopy, diff --git a/libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py b/libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py index 73b7face3..b3574b8f5 100644 --- a/libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py +++ b/libraries/microsoft-agents-hosting-core/tests/tools/testing_adapter.py @@ -7,8 +7,8 @@ from typing import Callable, List, Optional, Awaitable from collections import deque -from microsoft.agents.hosting.authorization import ClaimsIdentity -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core.authorization import ClaimsIdentity +from microsoft.agents.activity import ( Activity, ActivityTypes, ChannelAccount, @@ -19,9 +19,9 @@ RoleTypes, InvokeResponse, ) -from microsoft.agents.hosting.channel_adapter import ChannelAdapter -from microsoft.agents.hosting.turn_context import TurnContext -from microsoft.agents.hosting.connector import UserTokenClient +from microsoft.agents.hosting.core.channel_adapter import ChannelAdapter +from microsoft.agents.hosting.core.turn_context import TurnContext +from microsoft.agents.hosting.core.connector import UserTokenClient AgentCallbackHandler = Callable[[TurnContext], Awaitable] diff --git a/libraries/microsoft-agents-hosting-core/tests/tools/testing_flow.py b/libraries/microsoft-agents-hosting-core/tests/tools/testing_flow.py index 01a95b7f8..04d45046d 100644 --- a/libraries/microsoft-agents-hosting-core/tests/tools/testing_flow.py +++ b/libraries/microsoft-agents-hosting-core/tests/tools/testing_flow.py @@ -7,7 +7,7 @@ from datetime import timedelta from functools import reduce -from microsoft.agents.core.models import Activity +from microsoft.agents.activity import Activity T = TypeVar("T") diff --git a/libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py b/libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py index 1b6c3b372..75de310db 100644 --- a/libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py +++ b/libraries/microsoft-agents-hosting-core/tests/tools/testing_utility.py @@ -2,13 +2,13 @@ # Licensed under the MIT License. from .testing_adapter import TestingAdapter -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ( Activity, ActivityTypes, ConversationAccount, ChannelAccount, ) -from microsoft.agents.hosting import TurnContext +from microsoft.agents.hosting.core import TurnContext class TestingUtility: diff --git a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py index 0511a3855..3a1eccdd8 100644 --- a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py +++ b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_activity_handler.py @@ -6,13 +6,13 @@ from http import HTTPStatus from typing import Any, List -from microsoft.agents.hosting import ActivityHandler, TurnContext -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core import ActivityHandler, TurnContext +from microsoft.agents.activity import ( InvokeResponse, ChannelAccount, ) -from microsoft.agents.core.teams import ( +from microsoft.agents.activity.teams import ( AppBasedLinkQuery, TeamInfo, ChannelInfo, diff --git a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py index beaa42bb8..c84b41e30 100644 --- a/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py +++ b/libraries/microsoft-agents-hosting-teams/microsoft/agents/hosting/teams/teams_info.py @@ -5,9 +5,9 @@ from typing import Optional, Tuple, Dict, Any, List -from microsoft.agents.core.models import Activity, Channels, ConversationParameters +from microsoft.agents.activity import Activity, Channels, ConversationParameters -from microsoft.agents.core.teams import ( +from microsoft.agents.activity.teams import ( TeamsChannelAccount, TeamsMeetingParticipant, MeetingInfo, @@ -22,8 +22,8 @@ TeamsBatchOperationResponse, ChannelInfo, ) -from microsoft.agents.hosting.connector.teams import TeamsConnectorClient -from microsoft.agents.hosting import ChannelServiceAdapter, TurnContext +from microsoft.agents.hosting.core.connector.teams import TeamsConnectorClient +from microsoft.agents.hosting.core import ChannelServiceAdapter, TurnContext class TeamsInfo: diff --git a/libraries/microsoft-agents-hosting-teams/pyproject.toml b/libraries/microsoft-agents-hosting-teams/pyproject.toml index 7965197c7..8098b7165 100644 --- a/libraries/microsoft-agents-hosting-teams/pyproject.toml +++ b/libraries/microsoft-agents-hosting-teams/pyproject.toml @@ -14,8 +14,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "microsoft-agents-connector", - "microsoft-agents-hosting", + "microsoft-agents-hosting-core", "aiohttp>=3.11.11", ] diff --git a/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/__init__.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/__init__.py deleted file mode 100644 index 2a092594e..000000000 --- a/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -<<<<<<< HEAD:libraries/microsoft-agents-blob/microsoft/agents/blob/__init__.py -from .blob_storage import BlobStorage, BlobStorageSettings - -__all__ = ["BlobStorage", "BlobStorageSettings"] -======= -from .blob_storage import BlobStorage -from .blob_storage_config import BlobStorageConfig - -__all__ = ["BlobStorage", "BlobStorageConfig"] ->>>>>>> b367489e023e2c734d93da01098ae138bc16ee5b:libraries/Storage/microsoft-agents-blob/microsoft/agents/blob/__init__.py diff --git a/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/__init__.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/__init__.py new file mode 100644 index 000000000..1c6767a2a --- /dev/null +++ b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/__init__.py @@ -0,0 +1,4 @@ +from .blob_storage import BlobStorage +from .blob_storage_config import BlobStorageConfig + +__all__ = ["BlobStorage", "BlobStorageConfig"] diff --git a/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py similarity index 91% rename from libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage.py rename to libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py index 3b4676b3b..f6fa01ca7 100644 --- a/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage.py +++ b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py @@ -7,10 +7,10 @@ BlobServiceClient, ) -from microsoft.agents.storage import StoreItem -from microsoft.agents.storage.storage import AsyncStorageBase -from microsoft.agents.storage._type_aliases import JSON -from microsoft.agents.storage.error_handling import ignore_error, is_status_code_error +from microsoft.agents.hosting.core.storage import StoreItem +from microsoft.agents.hosting.core.storage.storage import AsyncStorageBase +from microsoft.agents.hosting.core.storage._type_aliases import JSON +from microsoft.agents.hosting.core.storage.error_handling import ignore_error, is_status_code_error from .blob_storage_config import BlobStorageConfig diff --git a/libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage_config.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage_config.py similarity index 100% rename from libraries/microsoft-agents-storage-blob/microsoft/agents/blob/blob_storage_config.py rename to libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage_config.py diff --git a/libraries/microsoft-agents-storage-blob/pyproject.toml b/libraries/microsoft-agents-storage-blob/pyproject.toml index d30abf71d..b415a4e05 100644 --- a/libraries/microsoft-agents-storage-blob/pyproject.toml +++ b/libraries/microsoft-agents-storage-blob/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] -name = "microsoft-agents-blob" +name = "microsoft-agents-storage-blob" version = "0.0.0a1" description = "A blob storage library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] @@ -14,7 +14,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "microsoft.agents.storage", + "microsoft-agents-hosting-core", "azure-core", "azure-storage-blob", ] diff --git a/libraries/microsoft-agents-storage-blob/tests/test_blob_storage.py b/libraries/microsoft-agents-storage-blob/tests/test_blob_storage.py index 8bea6fce8..4e48d5e8b 100644 --- a/libraries/microsoft-agents-storage-blob/tests/test_blob_storage.py +++ b/libraries/microsoft-agents-storage-blob/tests/test_blob_storage.py @@ -6,11 +6,11 @@ import pytest import pytest_asyncio -from microsoft.agents.blob import BlobStorage, BlobStorageConfig +from microsoft.agents.storage.blob import BlobStorage, BlobStorageConfig from azure.storage.blob.aio import BlobServiceClient from azure.core.exceptions import ResourceNotFoundError -from microsoft.agents.storage.storage_test_utils import ( +from microsoft.agents.hosting.core.storage.storage_test_utils import ( CRUDStorageTests, StorageMock, StorageBaseline, diff --git a/test_samples/agent_to_agent/agent_1/agent1.py b/test_samples/agent_to_agent/agent_1/agent1.py index 123264ac3..3f8f8dac6 100644 --- a/test_samples/agent_to_agent/agent_1/agent1.py +++ b/test_samples/agent_to_agent/agent_1/agent1.py @@ -3,8 +3,8 @@ from aiohttp.web import HTTPException -from microsoft.agents.core import ChannelAdapterProtocol, TurnContextProtocol -from microsoft.agents.core.models import ( +from microsoft.agents.activity import ChannelAdapterProtocol, TurnContextProtocol +from microsoft.agents.activity import ( ActivityTypes, Activity, CallerIdConstants, @@ -17,14 +17,14 @@ ConversationResourceResponse, ConversationsResult, ) -from microsoft.agents.hosting.authorization import ClaimsIdentity -from microsoft.agents.hosting.client import ( +from microsoft.agents.hosting.core.authorization import ClaimsIdentity +from microsoft.agents.hosting.core.client import ( ChannelHostProtocol, ChannelInfoProtocol, ConversationIdFactoryProtocol, ConversationIdFactoryOptions, ) -from microsoft.agents.hosting import ( +from microsoft.agents.hosting.core import ( ActivityHandler, ChannelApiHandlerProtocol, ChannelAdapter, diff --git a/test_samples/agent_to_agent/agent_1/app.py b/test_samples/agent_to_agent/agent_1/app.py index da74e2982..ccbc48ccc 100644 --- a/test_samples/agent_to_agent/agent_1/app.py +++ b/test_samples/agent_to_agent/agent_1/app.py @@ -4,24 +4,24 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.hosting import RestChannelServiceClientFactory +from microsoft.agents.hosting.core import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import ( CloudAdapter, jwt_authorization_middleware, channel_service_route_table, ) -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, ) from microsoft.agents.authentication.msal import MsalAuth -from microsoft.agents.hosting.client import ( +from microsoft.agents.hosting.core.client import ( ConfigurationChannelHost, ConversationIdFactory, HttpAgentChannelFactory, ) -from microsoft.agents.storage import MemoryStorage +from microsoft.agents.hosting.core.storage import MemoryStorage from agent1 import Agent1 from config import DefaultConfig diff --git a/test_samples/agent_to_agent/agent_1/config.py b/test_samples/agent_to_agent/agent_1/config.py index 649e481d2..7e8f4b398 100644 --- a/test_samples/agent_to_agent/agent_1/config.py +++ b/test_samples/agent_to_agent/agent_1/config.py @@ -1,6 +1,6 @@ from os import environ from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration -from microsoft.agents.hosting.client import ( +from microsoft.agents.hosting.core.client import ( ChannelHostConfiguration, ChannelsConfiguration, ChannelInfo, diff --git a/test_samples/agent_to_agent/agent_2/agent2.py b/test_samples/agent_to_agent/agent_2/agent2.py index cfccc047d..92f71dbea 100644 --- a/test_samples/agent_to_agent/agent_2/agent2.py +++ b/test_samples/agent_to_agent/agent_2/agent2.py @@ -1,5 +1,5 @@ -from microsoft.agents.hosting import ActivityHandler, TurnContext -from microsoft.agents.core.models import ( +from microsoft.agents.hosting.core import ActivityHandler, TurnContext +from microsoft.agents.activity import ( ChannelAccount, Activity, EndOfConversationCodes, diff --git a/test_samples/agent_to_agent/agent_2/app.py b/test_samples/agent_to_agent/agent_2/app.py index 808286039..bf347de50 100644 --- a/test_samples/agent_to_agent/agent_2/app.py +++ b/test_samples/agent_to_agent/agent_2/app.py @@ -4,9 +4,9 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.hosting import RestChannelServiceClientFactory +from microsoft.agents.hosting.core import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/app_style/authorization_agent.py b/test_samples/app_style/authorization_agent.py index cf59f86e5..d2a9cde91 100644 --- a/test_samples/app_style/authorization_agent.py +++ b/test_samples/app_style/authorization_agent.py @@ -7,20 +7,20 @@ import traceback from dotenv import load_dotenv -from microsoft.agents.hosting.app import AgentApplication, TurnState -from microsoft.agents.hosting.app.oauth import Authorization +from microsoft.agents.hosting.core.app import AgentApplication, TurnState +from microsoft.agents.hosting.core.app.oauth import Authorization from microsoft.agents.hosting.aiohttp import ( CloudAdapter, ) from microsoft.agents.authentication.msal import MsalConnectionManager -from microsoft.agents.hosting import ( +from microsoft.agents.hosting.core import ( TurnContext, MessageFactory, ) -from microsoft.agents.storage import MemoryStorage -from microsoft.agents.core import load_configuration_from_env -from microsoft.agents.core.models import ActivityTypes, TokenResponse +from microsoft.agents.hosting.core.storage import MemoryStorage +from microsoft.agents.activity import load_configuration_from_env +from microsoft.agents.activity import ActivityTypes, TokenResponse from shared import GraphClient, GitHubClient, start_server diff --git a/test_samples/app_style/emtpy_agent.py b/test_samples/app_style/emtpy_agent.py index c85c7f01a..f39368878 100644 --- a/test_samples/app_style/emtpy_agent.py +++ b/test_samples/app_style/emtpy_agent.py @@ -9,21 +9,21 @@ from os import environ from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration -from microsoft.agents.hosting.app import AgentApplication, TurnState +from microsoft.agents.hosting.core.app import AgentApplication, TurnState from microsoft.agents.hosting.aiohttp import ( CloudAdapter, jwt_authorization_middleware, start_agent_process, ) -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, ) from microsoft.agents.authentication.msal import MsalAuth -from microsoft.agents.hosting import RestChannelServiceClientFactory, TurnContext -from microsoft.agents.storage import MemoryStorage +from microsoft.agents.hosting.core import RestChannelServiceClientFactory, TurnContext +from microsoft.agents.hosting.core.storage import MemoryStorage load_dotenv() diff --git a/test_samples/app_style/mcs_agent.py b/test_samples/app_style/mcs_agent.py index bc523e382..866aeb628 100644 --- a/test_samples/app_style/mcs_agent.py +++ b/test_samples/app_style/mcs_agent.py @@ -6,12 +6,12 @@ from typing import Optional from dotenv import load_dotenv -from microsoft.agents.hosting.app import AgentApplication, TurnState, ConversationState -from microsoft.agents.hosting.app.oauth import Authorization -from microsoft.agents.hosting import TurnContext, MessageFactory -from microsoft.agents.storage import MemoryStorage -from microsoft.agents.core.models import ActivityTypes, Activity -from microsoft.agents.core import load_configuration_from_env +from microsoft.agents.hosting.core.app import AgentApplication, TurnState, ConversationState +from microsoft.agents.hosting.core.app.oauth import Authorization +from microsoft.agents.hosting.core import TurnContext, MessageFactory +from microsoft.agents.hosting.core.storage import MemoryStorage +from microsoft.agents.activity import ActivityTypes, Activity +from microsoft.agents.activity import load_configuration_from_env from microsoft.agents.copilotstudio.client import ( ConnectionSettings, CopilotClient, diff --git a/test_samples/app_style/shared/start_server.py b/test_samples/app_style/shared/start_server.py index 17e8771d1..5f3ee9bfb 100644 --- a/test_samples/app_style/shared/start_server.py +++ b/test_samples/app_style/shared/start_server.py @@ -1,6 +1,6 @@ from os import environ -from microsoft.agents.hosting.authorization import AgentAuthConfiguration -from microsoft.agents.hosting.app import AgentApplication +from microsoft.agents.hosting.core.authorization import AgentAuthConfiguration +from microsoft.agents.hosting.core.app import AgentApplication from microsoft.agents.hosting.aiohttp import ( jwt_authorization_middleware, CloudAdapter, diff --git a/test_samples/app_style/streaming_agent.py b/test_samples/app_style/streaming_agent.py index 86aae008e..8a7716eb3 100644 --- a/test_samples/app_style/streaming_agent.py +++ b/test_samples/app_style/streaming_agent.py @@ -8,18 +8,18 @@ import traceback from dotenv import load_dotenv -from microsoft.agents.hosting.app import AgentApplication, TurnState -from microsoft.agents.hosting.app.oauth import Authorization +from microsoft.agents.hosting.core.app import AgentApplication, TurnState +from microsoft.agents.hosting.core.app.oauth import Authorization from microsoft.agents.hosting.aiohttp import CloudAdapter, Citation from microsoft.agents.authentication.msal import MsalConnectionManager -from microsoft.agents.hosting import ( +from microsoft.agents.hosting.core import ( TurnContext, MessageFactory, ) -from microsoft.agents.storage import MemoryStorage -from microsoft.agents.core import load_configuration_from_env -from microsoft.agents.core.models import Activity, ActivityTypes, SensitivityUsageInfo +from microsoft.agents.hosting.core.storage import MemoryStorage +from microsoft.agents.activity import load_configuration_from_env +from microsoft.agents.activity import Activity, ActivityTypes, SensitivityUsageInfo from shared import start_server diff --git a/test_samples/copilot_studio_client_sample/chat_console_service.py b/test_samples/copilot_studio_client_sample/chat_console_service.py index d7bf76537..f967fc247 100644 --- a/test_samples/copilot_studio_client_sample/chat_console_service.py +++ b/test_samples/copilot_studio_client_sample/chat_console_service.py @@ -1,5 +1,5 @@ from microsoft.agents.copilotstudio.client import CopilotClient -from microsoft.agents.core.models import Activity, ActivityTypes +from microsoft.agents.activity import Activity, ActivityTypes class ChatConsoleService: diff --git a/test_samples/empty_agent/app.py b/test_samples/empty_agent/app.py index 4b360c3d7..0b34cae75 100644 --- a/test_samples/empty_agent/app.py +++ b/test_samples/empty_agent/app.py @@ -4,9 +4,9 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.hosting import RestChannelServiceClientFactory +from microsoft.agents.hosting.core import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/empty_agent/empty_agent.py b/test_samples/empty_agent/empty_agent.py index c2988421c..52dc71f01 100644 --- a/test_samples/empty_agent/empty_agent.py +++ b/test_samples/empty_agent/empty_agent.py @@ -1,5 +1,5 @@ -from microsoft.agents.hosting import ActivityHandler, MessageFactory, TurnContext -from microsoft.agents.core.models import ChannelAccount +from microsoft.agents.hosting.core import ActivityHandler, MessageFactory, TurnContext +from microsoft.agents.activity import ChannelAccount class EmptyAgent(ActivityHandler): diff --git a/test_samples/teams_agent/app.py b/test_samples/teams_agent/app.py index a5f340851..7aa09c4be 100644 --- a/test_samples/teams_agent/app.py +++ b/test_samples/teams_agent/app.py @@ -5,16 +5,16 @@ from dotenv import load_dotenv from aiohttp.web import Application, Request, Response, run_app -from microsoft.agents.hosting import RestChannelServiceClientFactory -from microsoft.agents.hosting.state import UserState +from microsoft.agents.hosting.core import RestChannelServiceClientFactory +from microsoft.agents.hosting.core.state import UserState from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_decorator -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, ) from microsoft.agents.authentication.msal import MsalAuth -from microsoft.agents.storage import MemoryStorage +from microsoft.agents.hosting.core.storage import MemoryStorage from teams_handler import TeamsHandler from teams_sso import TeamsSso diff --git a/test_samples/teams_agent/helpers/task_module_response_factory.py b/test_samples/teams_agent/helpers/task_module_response_factory.py index 484e5e714..0b1922406 100644 --- a/test_samples/teams_agent/helpers/task_module_response_factory.py +++ b/test_samples/teams_agent/helpers/task_module_response_factory.py @@ -3,7 +3,7 @@ """Factory for creating task module responses.""" -from microsoft.agents.core.teams import ( +from microsoft.agents.activity.teams import ( TaskModuleResponse, TaskModuleTaskInfo, TaskModuleResponseBase, diff --git a/test_samples/teams_agent/teams_handler.py b/test_samples/teams_agent/teams_handler.py index c840ea8b3..0c2fce8e3 100644 --- a/test_samples/teams_agent/teams_handler.py +++ b/test_samples/teams_agent/teams_handler.py @@ -1,7 +1,7 @@ -from microsoft.agents.hosting import MessageFactory, TurnContext +from microsoft.agents.hosting.core import MessageFactory, TurnContext from microsoft.agents.hosting.teams import TeamsActivityHandler, TeamsInfo -from microsoft.agents.core.models import ChannelAccount, ConversationParameters -from microsoft.agents.core.teams import MeetingNotification +from microsoft.agents.activity import ChannelAccount, ConversationParameters +from microsoft.agents.activity.teams import MeetingNotification class TeamsHandler(TeamsActivityHandler): diff --git a/test_samples/teams_agent/teams_multi_feature.py b/test_samples/teams_agent/teams_multi_feature.py index 4fc3f2bd8..8823e5e9a 100644 --- a/test_samples/teams_agent/teams_multi_feature.py +++ b/test_samples/teams_agent/teams_multi_feature.py @@ -1,9 +1,9 @@ import json from os import getenv -from microsoft.agents.hosting import MessageFactory, TurnContext -from microsoft.agents.core.models import ChannelAccount, Attachment -from microsoft.agents.core.teams import ( +from microsoft.agents.hosting.core import MessageFactory, TurnContext +from microsoft.agents.activity import ChannelAccount, Attachment +from microsoft.agents.activity.teams import ( TaskModuleResponse, TaskModuleTaskInfo, TaskModuleRequest, diff --git a/test_samples/teams_agent/teams_sso.py b/test_samples/teams_agent/teams_sso.py index d337883a3..24ad03193 100644 --- a/test_samples/teams_agent/teams_sso.py +++ b/test_samples/teams_agent/teams_sso.py @@ -1,11 +1,11 @@ -from microsoft.agents.hosting import ( +from microsoft.agents.hosting.core import ( ActivityHandler, OAuthFlow, MessageFactory, TurnContext, ) -from microsoft.agents.hosting.state import UserState -from microsoft.agents.core.models import ChannelAccount +from microsoft.agents.hosting.core.state import UserState +from microsoft.agents.activity import ChannelAccount from microsoft.agents.hosting.teams import TeamsActivityHandler, TeamsInfo from graph_client import GraphClient diff --git a/test_samples/weather-agent-open-ai/app.py b/test_samples/weather-agent-open-ai/app.py index 1c98027d6..6e68b6a24 100644 --- a/test_samples/weather-agent-open-ai/app.py +++ b/test_samples/weather-agent-open-ai/app.py @@ -4,9 +4,9 @@ from dotenv import load_dotenv from aiohttp.web import Application, Request, Response, run_app -from microsoft.agents.hosting import RestChannelServiceClientFactory +from microsoft.agents.hosting.core import RestChannelServiceClientFactory from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.hosting.authorization import ( +from microsoft.agents.hosting.core.authorization import ( Connections, AccessTokenProviderBase, ClaimsIdentity, diff --git a/test_samples/weather-agent-open-ai/weather_agent.py b/test_samples/weather-agent-open-ai/weather_agent.py index bb6e631dc..f2ee27157 100644 --- a/test_samples/weather-agent-open-ai/weather_agent.py +++ b/test_samples/weather-agent-open-ai/weather_agent.py @@ -1,8 +1,8 @@ from __future__ import annotations from typing import Union -from microsoft.agents.hosting import ActivityHandler, MessageFactory, TurnContext -from microsoft.agents.core.models import ChannelAccount, Attachment +from microsoft.agents.hosting.core import ActivityHandler, MessageFactory, TurnContext +from microsoft.agents.activity import ChannelAccount, Attachment from agents import ( Agent as OpenAIAgent, From ac0a0e5241d68cde494d5a317f49c73ab15309e3 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Mon, 21 Jul 2025 16:51:56 -0700 Subject: [PATCH 04/10] Restructuring and naming done. Exporting improvement pending. --formatting --- .../agents/hosting/aiohttp/jwt_authorization_middleware.py | 5 ++++- .../microsoft/agents/hosting/core/__init__.py | 2 +- .../agents/hosting/core/app/oauth/authorization.py | 5 ++++- .../agents/hosting/core/channel_service_adapter.py | 5 ++++- .../hosting/core/channel_service_client_factory_base.py | 5 ++++- .../tests/test_error_handling.py | 5 ++++- .../tests/test_memory_storage.py | 5 ++++- libraries/microsoft-agents-hosting-core/tests/test_state.py | 6 +++++- .../microsoft/agents/storage/blob/blob_storage.py | 5 ++++- test_samples/app_style/mcs_agent.py | 6 +++++- 10 files changed, 39 insertions(+), 10 deletions(-) diff --git a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py index 3c2679025..a9b594c61 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py +++ b/libraries/microsoft-agents-hosting-aiohttp/microsoft/agents/hosting/aiohttp/jwt_authorization_middleware.py @@ -1,7 +1,10 @@ import functools from aiohttp.web import Request, middleware, json_response -from microsoft.agents.hosting.core.authorization import AgentAuthConfiguration, JwtTokenValidator +from microsoft.agents.hosting.core.authorization import ( + AgentAuthConfiguration, + JwtTokenValidator, +) @middleware diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py index c7bb88032..4fb94606e 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py @@ -26,4 +26,4 @@ "Middleware", "RestChannelServiceClientFactory", "TurnContext", -] \ No newline at end of file +] diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py index 5c5004193..a63a649e0 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/oauth/authorization.py @@ -5,7 +5,10 @@ import jwt from typing import Dict, Optional, Callable, Awaitable -from microsoft.agents.hosting.core.authorization import Connections, AccessTokenProviderBase +from microsoft.agents.hosting.core.authorization import ( + Connections, + AccessTokenProviderBase, +) from microsoft.agents.hosting.core.storage import Storage from microsoft.agents.activity import TokenResponse, Activity from microsoft.agents.hosting.core.storage import StoreItem diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py index 7488e32f1..128a9b20b 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_adapter.py @@ -31,7 +31,10 @@ ConnectorClient, UserTokenClient, ) -from microsoft.agents.hosting.core.authorization import AuthenticationConstants, ClaimsIdentity +from microsoft.agents.hosting.core.authorization import ( + AuthenticationConstants, + ClaimsIdentity, +) from .channel_service_client_factory_base import ChannelServiceClientFactoryBase from .channel_adapter import ChannelAdapter from .turn_context import TurnContext diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py index 61ad052e7..2e2c60c3f 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/channel_service_client_factory_base.py @@ -2,7 +2,10 @@ from abc import abstractmethod from microsoft.agents.hosting.core.authorization import ClaimsIdentity -from microsoft.agents.hosting.core.connector import ConnectorClientBase, UserTokenClientBase +from microsoft.agents.hosting.core.connector import ( + ConnectorClientBase, + UserTokenClientBase, +) class ChannelServiceClientFactoryBase(Protocol): diff --git a/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py b/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py index 953f9a5ad..f912455bd 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_error_handling.py @@ -1,5 +1,8 @@ import pytest -from microsoft.agents.hosting.core.storage.error_handling import ignore_error, is_status_code_error +from microsoft.agents.hosting.core.storage.error_handling import ( + ignore_error, + is_status_code_error, +) class CustomError(Exception): diff --git a/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py b/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py index c80742366..11a1e6eee 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_memory_storage.py @@ -1,5 +1,8 @@ from microsoft.agents.hosting.core.storage.memory_storage import MemoryStorage -from microsoft.agents.hosting.core.storage.storage_test_utils import CRUDStorageTests, StorageMock +from microsoft.agents.hosting.core.storage.storage_test_utils import ( + CRUDStorageTests, + StorageMock, +) class MemoryStorageMock(StorageMock): diff --git a/libraries/microsoft-agents-hosting-core/tests/test_state.py b/libraries/microsoft-agents-hosting-core/tests/test_state.py index d040f3b51..84730af56 100644 --- a/libraries/microsoft-agents-hosting-core/tests/test_state.py +++ b/libraries/microsoft-agents-hosting-core/tests/test_state.py @@ -7,7 +7,11 @@ import pytest from unittest.mock import AsyncMock, MagicMock -from microsoft.agents.hosting.core.app.state.state import State, state, StatePropertyAccessor +from microsoft.agents.hosting.core.app.state.state import ( + State, + state, + StatePropertyAccessor, +) from microsoft.agents.hosting.core.turn_context import TurnContext from microsoft.agents.hosting.core.storage import Storage, StoreItem diff --git a/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py index f6fa01ca7..02350a290 100644 --- a/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py +++ b/libraries/microsoft-agents-storage-blob/microsoft/agents/storage/blob/blob_storage.py @@ -10,7 +10,10 @@ from microsoft.agents.hosting.core.storage import StoreItem from microsoft.agents.hosting.core.storage.storage import AsyncStorageBase from microsoft.agents.hosting.core.storage._type_aliases import JSON -from microsoft.agents.hosting.core.storage.error_handling import ignore_error, is_status_code_error +from microsoft.agents.hosting.core.storage.error_handling import ( + ignore_error, + is_status_code_error, +) from .blob_storage_config import BlobStorageConfig diff --git a/test_samples/app_style/mcs_agent.py b/test_samples/app_style/mcs_agent.py index 866aeb628..ac86bda66 100644 --- a/test_samples/app_style/mcs_agent.py +++ b/test_samples/app_style/mcs_agent.py @@ -6,7 +6,11 @@ from typing import Optional from dotenv import load_dotenv -from microsoft.agents.hosting.core.app import AgentApplication, TurnState, ConversationState +from microsoft.agents.hosting.core.app import ( + AgentApplication, + TurnState, + ConversationState, +) from microsoft.agents.hosting.core.app.oauth import Authorization from microsoft.agents.hosting.core import TurnContext, MessageFactory from microsoft.agents.hosting.core.storage import MemoryStorage From 05367d36591b1f01920864a0effa69af6a282129 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 22 Jul 2025 09:21:22 -0700 Subject: [PATCH 05/10] ADO Pipeline fix --- .azdo/ci-pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azdo/ci-pr.yaml b/.azdo/ci-pr.yaml index b2adf786d..75426096a 100644 --- a/.azdo/ci-pr.yaml +++ b/.azdo/ci-pr.yaml @@ -38,7 +38,7 @@ steps: mkdir -p dist for dir in libraries/*; do if [ -f "$dir/pyproject.toml" ]; then - (cd "$dir" && python -m build --outdir ../../../dist) + (cd "$dir" && python -m build --outdir ../../dist) fi done displayName: 'Build packages' From b93c568b23554f386a2625d93b71d5a3a28a4efc Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 22 Jul 2025 10:02:16 -0700 Subject: [PATCH 06/10] Exporting top level classes --- .../microsoft/agents/hosting/core/__init__.py | 129 +++++++++++++++++- .../agents/hosting/core/app/__init__.py | 14 ++ .../agents/hosting/core/connector/__init__.py | 8 +- test_samples/agent_to_agent/agent_1/app.py | 20 ++- test_samples/agent_to_agent/agent_2/app.py | 6 +- test_samples/app_style/shared/start_server.py | 5 +- 6 files changed, 163 insertions(+), 19 deletions(-) diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py index 4fb94606e..afbd4e684 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py @@ -1,4 +1,3 @@ -# Import necessary modules from .activity_handler import ActivityHandler from .agent import Agent from .oauth_flow import OAuthFlow @@ -12,6 +11,78 @@ from .rest_channel_service_client_factory import RestChannelServiceClientFactory from .turn_context import TurnContext +# Application Style +from .app.agent_application import AgentApplication +from .app.app_error import ApplicationError +from .app.app_options import ApplicationOptions +from .app.input_file import InputFile, InputFileDownloader +from .app.query import Query +from .app.route import Route, RouteHandler +from .app.typing_indicator import TypingIndicator + +# OAuth +from .app.oauth.authorization import ( + Authorization, + AuthorizationHandlers, + AuthHandler, + SignInState, +) + +# App State +from .app.state.conversation_state import ConversationState +from .app.state.state import State, state +from .app.state.temp_state import TempState +from .app.state.turn_state import TurnState + +# Authorization +from .authorization.access_token_provider_base import AccessTokenProviderBase +from .authorization.authentication_constants import AuthenticationConstants +from .authorization.anonymous_token_provider import AnonymousTokenProvider +from .authorization.connections import Connections +from .authorization.agent_auth_configuration import AgentAuthConfiguration +from .authorization.claims_identity import ClaimsIdentity +from .authorization.jwt_token_validator import JwtTokenValidator + +# Client API +from .client.agent_conversation_reference import AgentConversationReference +from .client.channel_factory_protocol import ChannelFactoryProtocol +from .client.channel_host_protocol import ChannelHostProtocol +from .client.channel_info_protocol import ChannelInfoProtocol +from .client.channel_protocol import ChannelProtocol +from .client.channels_configuration import ( + ChannelsConfiguration, + ChannelHostConfiguration, + ChannelInfo, +) +from .client.configuration_channel_host import ConfigurationChannelHost +from .client.conversation_constants import ConversationConstants +from .client.conversation_id_factory_options import ConversationIdFactoryOptions +from .client.conversation_id_factory_protocol import ConversationIdFactoryProtocol +from .client.conversation_id_factory import ConversationIdFactory +from .client.http_agent_channel_factory import HttpAgentChannelFactory +from .client.http_agent_channel import HttpAgentChannel + +# Connector API +from .connector import ( + ConnectorClient, + UserTokenClient, + UserTokenClientBase, + TeamsConnectorClient, + ConnectorClientBase, + get_product_info, +) + +# State management +from .state.agent_state import AgentState +from .state.state_property_accessor import StatePropertyAccessor +from .state.user_state import UserState + +# Storage +from .storage.store_item import StoreItem +from .storage import Storage +from .storage.memory_storage import MemoryStorage + + # Define the package's public interface __all__ = [ "ActivityHandler", @@ -26,4 +97,60 @@ "Middleware", "RestChannelServiceClientFactory", "TurnContext", + "ActivityType", + "AgentApplication", + "ApplicationError", + "ApplicationOptions", + "ConversationUpdateType", + "InputFile", + "InputFileDownloader", + "MessageReactionType", + "MessageUpdateType", + "Query", + "Route", + "RouteHandler", + "TypingIndicator", + "ConversationState", + "state", + "State", + "TurnState", + "TempState", + "Authorization", + "AuthorizationHandlers", + "AuthHandler", + "SignInState", + "AccessTokenProviderBase", + "AuthenticationConstants", + "AnonymousTokenProvider", + "Connections", + "AgentAuthConfiguration", + "ClaimsIdentity", + "JwtTokenValidator", + "AgentConversationReference", + "ChannelFactoryProtocol", + "ChannelHostProtocol", + "ChannelInfoProtocol", + "ChannelProtocol", + "ChannelsConfiguration", + "ChannelHostConfiguration", + "ChannelInfo", + "ConfigurationChannelHost", + "ConversationConstants", + "ConversationIdFactoryOptions", + "ConversationIdFactoryProtocol", + "ConversationIdFactory", + "HttpAgentChannelFactory", + "HttpAgentChannel", + "ConnectorClient", + "UserTokenClient", + "UserTokenClientBase", + "TeamsConnectorClient", + "ConnectorClientBase", + "get_product_info", + "AgentState", + "StatePropertyAccessor", + "UserState", + "StoreItem", + "Storage", + "MemoryStorage", ] diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/__init__.py index b5ee917c2..124de7c52 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/app/__init__.py @@ -12,6 +12,16 @@ from .query import Query from .route import Route, RouteHandler from .typing_indicator import TypingIndicator + +# OAuth +from .oauth.authorization import ( + Authorization, + AuthorizationHandlers, + AuthHandler, + SignInState, +) + +# App State from .state.conversation_state import ConversationState from .state.state import State, StatePropertyAccessor, state from .state.temp_state import TempState @@ -38,4 +48,8 @@ "StatePropertyAccessor", "TurnState", "TempState", + "Authorization", + "AuthorizationHandlers", + "AuthHandler", + "SignInState", ] diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/__init__.py index 6752cd306..82d5c89a0 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/connector/__init__.py @@ -1,13 +1,19 @@ from .user_token_client_base import UserTokenClientBase from .connector_client_base import ConnectorClientBase +from .get_product_info import get_product_info + +# Client API from .client.connector_client import ConnectorClient from .client.user_token_client import UserTokenClient -from .get_product_info import get_product_info + +# Teams API +from .teams.teams_connector_client import TeamsConnectorClient __all__ = [ "ConnectorClient", "UserTokenClient", "UserTokenClientBase", + "TeamsConnectorClient", "ConnectorClientBase", "get_product_info", ] diff --git a/test_samples/agent_to_agent/agent_1/app.py b/test_samples/agent_to_agent/agent_1/app.py index ccbc48ccc..a1ee49357 100644 --- a/test_samples/agent_to_agent/agent_1/app.py +++ b/test_samples/agent_to_agent/agent_1/app.py @@ -4,24 +4,22 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.hosting.core import RestChannelServiceClientFactory -from microsoft.agents.hosting.aiohttp import ( - CloudAdapter, - jwt_authorization_middleware, - channel_service_route_table, -) -from microsoft.agents.hosting.core.authorization import ( +from microsoft.agents.hosting.core import ( Connections, AccessTokenProviderBase, ClaimsIdentity, -) -from microsoft.agents.authentication.msal import MsalAuth -from microsoft.agents.hosting.core.client import ( ConfigurationChannelHost, ConversationIdFactory, HttpAgentChannelFactory, + MemoryStorage, + RestChannelServiceClientFactory, ) -from microsoft.agents.hosting.core.storage import MemoryStorage +from microsoft.agents.hosting.aiohttp import ( + CloudAdapter, + jwt_authorization_middleware, + channel_service_route_table, +) +from microsoft.agents.authentication.msal import MsalAuth from agent1 import Agent1 from config import DefaultConfig diff --git a/test_samples/agent_to_agent/agent_2/app.py b/test_samples/agent_to_agent/agent_2/app.py index bf347de50..17613c067 100644 --- a/test_samples/agent_to_agent/agent_2/app.py +++ b/test_samples/agent_to_agent/agent_2/app.py @@ -4,13 +4,13 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from microsoft.agents.hosting.core import RestChannelServiceClientFactory -from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.hosting.core.authorization import ( +from microsoft.agents.hosting.core import ( Connections, AccessTokenProviderBase, ClaimsIdentity, + RestChannelServiceClientFactory, ) +from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware from microsoft.agents.authentication.msal import MsalAuth from agent2 import Agent2 diff --git a/test_samples/app_style/shared/start_server.py b/test_samples/app_style/shared/start_server.py index 5f3ee9bfb..a75e3d056 100644 --- a/test_samples/app_style/shared/start_server.py +++ b/test_samples/app_style/shared/start_server.py @@ -1,12 +1,11 @@ from os import environ -from microsoft.agents.hosting.core.authorization import AgentAuthConfiguration -from microsoft.agents.hosting.core.app import AgentApplication +from microsoft.agents.hosting.core import AgentApplication, AgentAuthConfiguration from microsoft.agents.hosting.aiohttp import ( + start_agent_process, jwt_authorization_middleware, CloudAdapter, ) from aiohttp.web import Request, Response, Application, run_app -from microsoft.agents.hosting.aiohttp._start_agent_process import start_agent_process def start_server( From f57b7ce31c3ec7302c5d526b80c90851614a0e1a Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 22 Jul 2025 11:12:47 -0700 Subject: [PATCH 07/10] Updating samples --- test_samples/app_style/authorization_agent.py | 17 ++-- test_samples/app_style/auto_auth.py | 0 test_samples/app_style/emtpy_agent.py | 58 +++-------- test_samples/app_style/mcs_agent.py | 16 +-- test_samples/app_style/streaming_agent.py | 16 +-- test_samples/empty_agent/README.md | 99 ------------------- test_samples/empty_agent/app.py | 62 ------------ test_samples/empty_agent/config.py | 13 --- test_samples/empty_agent/empty_agent.py | 16 --- test_samples/empty_agent/env.TEMPLATE | 4 - test_samples/empty_agent/requirements.txt | 1 - 11 files changed, 41 insertions(+), 261 deletions(-) delete mode 100644 test_samples/app_style/auto_auth.py delete mode 100644 test_samples/empty_agent/README.md delete mode 100644 test_samples/empty_agent/app.py delete mode 100644 test_samples/empty_agent/config.py delete mode 100644 test_samples/empty_agent/empty_agent.py delete mode 100644 test_samples/empty_agent/env.TEMPLATE delete mode 100644 test_samples/empty_agent/requirements.txt diff --git a/test_samples/app_style/authorization_agent.py b/test_samples/app_style/authorization_agent.py index d2a9cde91..fb17625b3 100644 --- a/test_samples/app_style/authorization_agent.py +++ b/test_samples/app_style/authorization_agent.py @@ -7,20 +7,17 @@ import traceback from dotenv import load_dotenv -from microsoft.agents.hosting.core.app import AgentApplication, TurnState -from microsoft.agents.hosting.core.app.oauth import Authorization -from microsoft.agents.hosting.aiohttp import ( - CloudAdapter, -) -from microsoft.agents.authentication.msal import MsalConnectionManager - from microsoft.agents.hosting.core import ( + Authorization, + AgentApplication, + TurnState, TurnContext, MessageFactory, + MemoryStorage, ) -from microsoft.agents.hosting.core.storage import MemoryStorage -from microsoft.agents.activity import load_configuration_from_env -from microsoft.agents.activity import ActivityTypes, TokenResponse +from microsoft.agents.activity import load_configuration_from_env, ActivityTypes +from microsoft.agents.hosting.aiohttp import CloudAdapter +from microsoft.agents.authentication.msal import MsalConnectionManager from shared import GraphClient, GitHubClient, start_server diff --git a/test_samples/app_style/auto_auth.py b/test_samples/app_style/auto_auth.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/test_samples/app_style/emtpy_agent.py b/test_samples/app_style/emtpy_agent.py index f39368878..f6bea9029 100644 --- a/test_samples/app_style/emtpy_agent.py +++ b/test_samples/app_style/emtpy_agent.py @@ -8,62 +8,32 @@ from dotenv import load_dotenv from os import environ -from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration -from microsoft.agents.hosting.core.app import AgentApplication, TurnState from microsoft.agents.hosting.aiohttp import ( CloudAdapter, jwt_authorization_middleware, start_agent_process, ) -from microsoft.agents.hosting.core.authorization import ( - Connections, - AccessTokenProviderBase, - ClaimsIdentity, +from microsoft.agents.hosting.core import ( + Authorization, + AgentApplication, + TurnState, + TurnContext, + MemoryStorage, ) -from microsoft.agents.authentication.msal import MsalAuth - -from microsoft.agents.hosting.core import RestChannelServiceClientFactory, TurnContext -from microsoft.agents.hosting.core.storage import MemoryStorage +from microsoft.agents.authentication.msal import MsalConnectionManager +from microsoft.agents.activity import load_configuration_from_env load_dotenv() +agents_sdk_config = load_configuration_from_env(environ) -class DefaultConfig(MsalAuthConfiguration): - """Agent Configuration""" - - def __init__(self) -> None: - self.AUTH_TYPE = AuthTypes.client_secret - self.TENANT_ID = "" or environ.get("TENANT_ID") - self.CLIENT_ID = "" or environ.get("CLIENT_ID") - self.CLIENT_SECRET = "" or environ.get("CLIENT_SECRET") - self.PORT = 3978 - - -CONFIG = DefaultConfig() -AUTH_PROVIDER = MsalAuth(CONFIG) - - -class DefaultConnection(Connections): - def get_default_connection(self) -> AccessTokenProviderBase: - pass - - def get_token_provider( - self, claims_identity: ClaimsIdentity, service_url: str - ) -> AccessTokenProviderBase: - return AUTH_PROVIDER - - def get_connection(self, connection_name: str) -> AccessTokenProviderBase: - pass - - -CHANNEL_CLIENT_FACTORY = RestChannelServiceClientFactory(CONFIG, DefaultConnection()) - -# Create adapter. -ADAPTER = CloudAdapter(CHANNEL_CLIENT_FACTORY) +STORAGE = MemoryStorage() +CONNECTION_MANAGER = MsalConnectionManager(**agents_sdk_config) +ADAPTER = CloudAdapter(connection_manager=CONNECTION_MANAGER) +AUTHORIZATION = Authorization(STORAGE, CONNECTION_MANAGER, **agents_sdk_config) AGENT_APP = AgentApplication[TurnState]( - storage=MemoryStorage(), - adapter=ADAPTER, + storage=STORAGE, adapter=ADAPTER, authorization=AUTHORIZATION, **agents_sdk_config ) diff --git a/test_samples/app_style/mcs_agent.py b/test_samples/app_style/mcs_agent.py index ac86bda66..835055654 100644 --- a/test_samples/app_style/mcs_agent.py +++ b/test_samples/app_style/mcs_agent.py @@ -6,16 +6,20 @@ from typing import Optional from dotenv import load_dotenv -from microsoft.agents.hosting.core.app import ( +from microsoft.agents.hosting.core import ( + Authorization, + TurnContext, + MessageFactory, + MemoryStorage, AgentApplication, TurnState, ConversationState, ) -from microsoft.agents.hosting.core.app.oauth import Authorization -from microsoft.agents.hosting.core import TurnContext, MessageFactory -from microsoft.agents.hosting.core.storage import MemoryStorage -from microsoft.agents.activity import ActivityTypes, Activity -from microsoft.agents.activity import load_configuration_from_env +from microsoft.agents.activity import ( + load_configuration_from_env, + ActivityTypes, + Activity, +) from microsoft.agents.copilotstudio.client import ( ConnectionSettings, CopilotClient, diff --git a/test_samples/app_style/streaming_agent.py b/test_samples/app_style/streaming_agent.py index 8a7716eb3..95f4ab202 100644 --- a/test_samples/app_style/streaming_agent.py +++ b/test_samples/app_style/streaming_agent.py @@ -8,18 +8,22 @@ import traceback from dotenv import load_dotenv -from microsoft.agents.hosting.core.app import AgentApplication, TurnState -from microsoft.agents.hosting.core.app.oauth import Authorization from microsoft.agents.hosting.aiohttp import CloudAdapter, Citation from microsoft.agents.authentication.msal import MsalConnectionManager from microsoft.agents.hosting.core import ( + Authorization, + AgentApplication, + TurnState, TurnContext, - MessageFactory, + MemoryStorage, +) +from microsoft.agents.activity import ( + load_configuration_from_env, + Activity, + ActivityTypes, + SensitivityUsageInfo, ) -from microsoft.agents.hosting.core.storage import MemoryStorage -from microsoft.agents.activity import load_configuration_from_env -from microsoft.agents.activity import Activity, ActivityTypes, SensitivityUsageInfo from shared import start_server diff --git a/test_samples/empty_agent/README.md b/test_samples/empty_agent/README.md deleted file mode 100644 index 290ae9cc3..000000000 --- a/test_samples/empty_agent/README.md +++ /dev/null @@ -1,99 +0,0 @@ -# Empty-Agent - -This is a sample of a simple Agent that is hosted on an aiohttp web service. This Agent is configured to accept a request and echo the text of the request back to the caller. - -This Agent Sample is intended to introduce you to the basic operation of the Microsoft 365 Agents SDK messaging loop. It can also be used as the base for a custom Agent you choose to develop. - -## Prerequisites - -- [Python](https://python.org) version 3.9 or higher - - ```bash - # determine python version - python --version - ``` - -## Running this sample - -1. Open this folder from your IDE or Terminal of preference -2. Check that you have the libraries installed from pypi test and your environment activated as explained in the README from the `test_samples` folder -3. Install required Python dependencies - -```sh -pip install -r requirements.txt -``` - -4. Configure environment variables - - Copy the `env.TEMPLATE` file to `.env` and set the required values: - - ```sh - cp env.TEMPLATE .env - ``` - - Then edit the `.env` file to add your credentials (if needed). For anonymous mode, you can leave them empty. - -5. Start the Python application - -```sh -python agent_application.py -``` - -At this point you should see a message indicating the server is running on port 3978. The agent is ready to accept messages. - -### Interact with the bot from the Teams App Test Tool - -To interact with the bot you need a chat client, during the install phase we have acquired the `teams-test-app-tool` than can be used to interact with your bot running in `localhost:3978` - -> [!Important] -> The test tool only supports anonymous mode, that means without any `clientId`. - -1. Start the test tool with - -```bash -npm run test-tool -``` - -The tool will open a web browser showing the Teams App Test Tool, ready to send messages to your bot. - - -Refresh the browser to start a new conversation with the Empty agent. - -You should see a message from the bot like: `Echo running on Agents SDK version: {version}` - - -### Interact with the agent with WebChat UI using Azure Bot Service - -1. [Create an Azure Bot](https://aka.ms/AgentsSDK-CreateBot) - - Record the Application ID, the Tenant ID, and the Client Secret for use below - -1. Configuring the token connection in the Agent settings - 1. Open the `env.TEMPLATE` file in the root of the sample project, rename it to `.env` and configure the following values: - 1. Set the **clientId** to the AppId of the bot identity. - 2. Set the **clientSecret** to the Secret that was created for your identity. *This is the `Secret Value` shown in the AppRegistration*. - 3. Set the **tenantId** to the Tenant Id where your application is registered. - -1. Install the tool [dev tunnel](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started?tabs=windows) -1. Run `dev tunnels`. See [Create and host a dev tunnel](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started?tabs=windows) and host the tunnel with anonymous user access command as shown below: - - ```bash - devtunnel host -p 3978 --allow-anonymous - ``` - -1. Take note of the url shown after `Connect via browser:` - -4. On the Azure Bot, select **Settings**, then **Configuration**, and update the **Messaging endpoint** to `{tunnel-url}/api/messages` - -5. Start the Agent using `npm start` (for JavaScript) or `python app.py` (for Python) - -6. Select **Test in WebChat** on the Azure portal. - - -### Deploy to Azure - -[TBD] - - -## Further reading - -To learn more about building Bots and Agents, see our [Microsoft 365 Agents SDK](https://github.com/microsoft/agents) repo. \ No newline at end of file diff --git a/test_samples/empty_agent/app.py b/test_samples/empty_agent/app.py deleted file mode 100644 index 0b34cae75..000000000 --- a/test_samples/empty_agent/app.py +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -from aiohttp.web import Application, Request, Response, run_app -from dotenv import load_dotenv - -from microsoft.agents.hosting.core import RestChannelServiceClientFactory -from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware -from microsoft.agents.hosting.core.authorization import ( - Connections, - AccessTokenProviderBase, - ClaimsIdentity, -) -from microsoft.agents.authentication.msal import MsalAuth - -from empty_agent import EmptyAgent -from config import DefaultConfig - -load_dotenv() - -AUTH_PROVIDER = MsalAuth(DefaultConfig()) - - -class DefaultConnection(Connections): - def get_default_connection(self) -> AccessTokenProviderBase: - pass - - def get_token_provider( - self, claims_identity: ClaimsIdentity, service_url: str - ) -> AccessTokenProviderBase: - return AUTH_PROVIDER - - def get_connection(self, connection_name: str) -> AccessTokenProviderBase: - pass - - -CONFIG = DefaultConfig() -CHANNEL_CLIENT_FACTORY = RestChannelServiceClientFactory(CONFIG, DefaultConnection()) - -# Create adapter. -ADAPTER = CloudAdapter(CHANNEL_CLIENT_FACTORY) - -# Create the Agent -AGENT = EmptyAgent() - - -# Listen for incoming requests on /api/messages -async def messages(req: Request) -> Response: - adapter: CloudAdapter = req.app["adapter"] - return await adapter.process(req, AGENT) - - -APP = Application(middlewares=[jwt_authorization_middleware]) -APP.router.add_post("/api/messages", messages) -APP["agent_configuration"] = CONFIG -APP["adapter"] = ADAPTER - -if __name__ == "__main__": - try: - run_app(APP, host="localhost", port=CONFIG.PORT) - except Exception as error: - raise error diff --git a/test_samples/empty_agent/config.py b/test_samples/empty_agent/config.py deleted file mode 100644 index cb76b7580..000000000 --- a/test_samples/empty_agent/config.py +++ /dev/null @@ -1,13 +0,0 @@ -from os import environ -from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration - - -class DefaultConfig(MsalAuthConfiguration): - """Agent Configuration""" - - def __init__(self) -> None: - self.AUTH_TYPE = AuthTypes.client_secret - self.TENANT_ID = "" or environ.get("TENANT_ID") - self.CLIENT_ID = "" or environ.get("CLIENT_ID") - self.CLIENT_SECRET = "" or environ.get("CLIENT_SECRET") - self.PORT = 3978 diff --git a/test_samples/empty_agent/empty_agent.py b/test_samples/empty_agent/empty_agent.py deleted file mode 100644 index 52dc71f01..000000000 --- a/test_samples/empty_agent/empty_agent.py +++ /dev/null @@ -1,16 +0,0 @@ -from microsoft.agents.hosting.core import ActivityHandler, MessageFactory, TurnContext -from microsoft.agents.activity import ChannelAccount - - -class EmptyAgent(ActivityHandler): - async def on_members_added_activity( - self, members_added: list[ChannelAccount], turn_context: TurnContext - ): - for member in members_added: - if member.id != turn_context.activity.recipient.id: - await turn_context.send_activity("Hello and welcome!") - - async def on_message_activity(self, turn_context: TurnContext): - return await turn_context.send_activity( - MessageFactory.text(f"Echo: {turn_context.activity.text}") - ) diff --git a/test_samples/empty_agent/env.TEMPLATE b/test_samples/empty_agent/env.TEMPLATE deleted file mode 100644 index e9f542ca9..000000000 --- a/test_samples/empty_agent/env.TEMPLATE +++ /dev/null @@ -1,4 +0,0 @@ -# Rename to .env -TENANT_ID= -CLIENT_ID= -CLIENT_SECRET= \ No newline at end of file diff --git a/test_samples/empty_agent/requirements.txt b/test_samples/empty_agent/requirements.txt deleted file mode 100644 index 3e338bfa2..000000000 --- a/test_samples/empty_agent/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -python-dotenv \ No newline at end of file From f2fac7062d41fcfc288e5b9e8eba32923b611cd8 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 22 Jul 2025 12:56:10 -0700 Subject: [PATCH 08/10] Integration fixes --- .../microsoft/agents/authentication/msal/msal_auth.py | 5 ++--- .../microsoft/agents/hosting/core/__init__.py | 2 ++ .../microsoft/agents/hosting/core/authorization/__init__.py | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py index 6176f215c..c6086a77d 100644 --- a/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py +++ b/libraries/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py @@ -13,13 +13,12 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes -from microsoft.agents.hosting.core.authorization import ( +from microsoft.agents.hosting.core import ( + AuthTypes, AccessTokenProviderBase, AgentAuthConfiguration, ) -from microsoft.agents.hosting.core.authorization import AuthTypes - class MsalAuth(AccessTokenProviderBase): diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py index afbd4e684..5d95f4e64 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/__init__.py @@ -42,6 +42,7 @@ from .authorization.agent_auth_configuration import AgentAuthConfiguration from .authorization.claims_identity import ClaimsIdentity from .authorization.jwt_token_validator import JwtTokenValidator +from .authorization.auth_types import AuthTypes # Client API from .client.agent_conversation_reference import AgentConversationReference @@ -126,6 +127,7 @@ "AgentAuthConfiguration", "ClaimsIdentity", "JwtTokenValidator", + "AuthTypes", "AgentConversationReference", "ChannelFactoryProtocol", "ChannelHostProtocol", diff --git a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/__init__.py b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/__init__.py index 4a78f57bf..a72c529d0 100644 --- a/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/__init__.py +++ b/libraries/microsoft-agents-hosting-core/microsoft/agents/hosting/core/authorization/__init__.py @@ -5,6 +5,7 @@ from .agent_auth_configuration import AgentAuthConfiguration from .claims_identity import ClaimsIdentity from .jwt_token_validator import JwtTokenValidator +from .auth_types import AuthTypes __all__ = [ "AccessTokenProviderBase", @@ -14,4 +15,5 @@ "AgentAuthConfiguration", "ClaimsIdentity", "JwtTokenValidator", + "AuthTypes", ] From be8a22088de8f70bbafad5c7c82d2711703533b8 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 22 Jul 2025 13:24:44 -0700 Subject: [PATCH 09/10] Samples updates --- test_samples/app_style/authorization_agent.py | 4 ++-- test_samples/app_style/emtpy_agent.py | 4 ++-- test_samples/app_style/mcs_agent.py | 4 ++-- test_samples/app_style/streaming_agent.py | 7 +++---- test_samples/copilot_studio_client_sample/app.py | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/test_samples/app_style/authorization_agent.py b/test_samples/app_style/authorization_agent.py index fb17625b3..77dd41f7c 100644 --- a/test_samples/app_style/authorization_agent.py +++ b/test_samples/app_style/authorization_agent.py @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -from os import environ +from os import environ, path import re import sys import traceback @@ -21,7 +21,7 @@ from shared import GraphClient, GitHubClient, start_server -load_dotenv() +load_dotenv(path.join(path.dirname(__file__), ".env")) agents_sdk_config = load_configuration_from_env(environ) diff --git a/test_samples/app_style/emtpy_agent.py b/test_samples/app_style/emtpy_agent.py index f6bea9029..9fa9b420e 100644 --- a/test_samples/app_style/emtpy_agent.py +++ b/test_samples/app_style/emtpy_agent.py @@ -7,7 +7,7 @@ from aiohttp.web import Application, Request, Response, run_app from dotenv import load_dotenv -from os import environ +from os import environ, path from microsoft.agents.hosting.aiohttp import ( CloudAdapter, jwt_authorization_middleware, @@ -23,7 +23,7 @@ from microsoft.agents.authentication.msal import MsalConnectionManager from microsoft.agents.activity import load_configuration_from_env -load_dotenv() +load_dotenv(path.join(path.dirname(__file__), ".env")) agents_sdk_config = load_configuration_from_env(environ) diff --git a/test_samples/app_style/mcs_agent.py b/test_samples/app_style/mcs_agent.py index 835055654..a22dd2f4a 100644 --- a/test_samples/app_style/mcs_agent.py +++ b/test_samples/app_style/mcs_agent.py @@ -2,7 +2,7 @@ # Licensed under the MIT License. import traceback -from os import environ +from os import environ, path from typing import Optional from dotenv import load_dotenv @@ -31,7 +31,7 @@ from shared import start_server -load_dotenv() +load_dotenv(path.join(path.dirname(__file__), ".env")) # Load configuration from environment agents_sdk_config = load_configuration_from_env(environ) diff --git a/test_samples/app_style/streaming_agent.py b/test_samples/app_style/streaming_agent.py index 95f4ab202..0d39de3cb 100644 --- a/test_samples/app_style/streaming_agent.py +++ b/test_samples/app_style/streaming_agent.py @@ -2,12 +2,11 @@ # Licensed under the MIT License. import asyncio -from os import environ -import re +from os import environ, path import sys import traceback -from dotenv import load_dotenv +from dotenv import load_dotenv, find_dotenv from microsoft.agents.hosting.aiohttp import CloudAdapter, Citation from microsoft.agents.authentication.msal import MsalConnectionManager @@ -27,7 +26,7 @@ from shared import start_server -load_dotenv() +load_dotenv(path.join(path.dirname(__file__), ".env")) agents_sdk_config = load_configuration_from_env(environ) diff --git a/test_samples/copilot_studio_client_sample/app.py b/test_samples/copilot_studio_client_sample/app.py index 1906694de..99b50c58c 100644 --- a/test_samples/copilot_studio_client_sample/app.py +++ b/test_samples/copilot_studio_client_sample/app.py @@ -9,7 +9,7 @@ from chat_console_service import ChatConsoleService from config import McsConnectionSettings -load_dotenv() +load_dotenv(path.join(path.dirname(__file__), ".env")) mcs_connection_settings = McsConnectionSettings() From 84629d24fdf1a308ef9b856d4fbc5fb0c545efd7 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Tue, 22 Jul 2025 13:33:11 -0700 Subject: [PATCH 10/10] Description updates --- libraries/microsoft-agents-activity/pyproject.toml | 4 ++-- libraries/microsoft-agents-authentication-msal/pyproject.toml | 2 +- .../microsoft-agents-copilotstudio-client/pyproject.toml | 2 +- libraries/microsoft-agents-hosting-aiohttp/pyproject.toml | 4 ++-- libraries/microsoft-agents-hosting-core/pyproject.toml | 4 ++-- libraries/microsoft-agents-hosting-teams/pyproject.toml | 4 ++-- libraries/microsoft-agents-storage-blob/pyproject.toml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/microsoft-agents-activity/pyproject.toml b/libraries/microsoft-agents-activity/pyproject.toml index 20f97e6c1..e5bc74e5d 100644 --- a/libraries/microsoft-agents-activity/pyproject.toml +++ b/libraries/microsoft-agents-activity/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "microsoft-agents-activity" version = "0.0.0a1" -description = "A protocol library for Microsoft Agents" +description = "Activity schema library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" classifiers = [ @@ -18,4 +18,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" +"Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-authentication-msal/pyproject.toml b/libraries/microsoft-agents-authentication-msal/pyproject.toml index 1d822b3f6..e04f099bd 100644 --- a/libraries/microsoft-agents-authentication-msal/pyproject.toml +++ b/libraries/microsoft-agents-authentication-msal/pyproject.toml @@ -21,4 +21,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" +"Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-copilotstudio-client/pyproject.toml b/libraries/microsoft-agents-copilotstudio-client/pyproject.toml index 242cad3bf..acf4ae816 100644 --- a/libraries/microsoft-agents-copilotstudio-client/pyproject.toml +++ b/libraries/microsoft-agents-copilotstudio-client/pyproject.toml @@ -18,4 +18,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/yourusername/microsoft-agents-client" +"Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml index 00173cf99..f443b7c89 100644 --- a/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml +++ b/libraries/microsoft-agents-hosting-aiohttp/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "microsoft-agents-hosting-aiohttp" version = "0.0.0a1" -description = "A protocol library for Microsoft Agents" +description = "Integration library for Microsoft Agents with aiohttp" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" classifiers = [ @@ -19,4 +19,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/microsoft/Agents-for-python" +"Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-hosting-core/pyproject.toml b/libraries/microsoft-agents-hosting-core/pyproject.toml index 9bb3ff77e..d98fc2f36 100644 --- a/libraries/microsoft-agents-hosting-core/pyproject.toml +++ b/libraries/microsoft-agents-hosting-core/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "microsoft-agents-hosting-core" version = "0.0.0a1" -description = "A protocol library for Microsoft Agents" +description = "Core library for Microsoft Agents" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" classifiers = [ @@ -22,4 +22,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" +"Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-hosting-teams/pyproject.toml b/libraries/microsoft-agents-hosting-teams/pyproject.toml index 8098b7165..49b00df04 100644 --- a/libraries/microsoft-agents-hosting-teams/pyproject.toml +++ b/libraries/microsoft-agents-hosting-teams/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "microsoft-agents-hosting-teams" version = "0.0.0a1" -description = "A protocol library for Microsoft Agents" +description = "Integration library for Microsoft Agents with Teams" authors = [{name = "Microsoft Corporation"}] requires-python = ">=3.9" classifiers = [ @@ -19,4 +19,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/microsoft/Agents-for-python" +"Homepage" = "https://github.com/microsoft/Agents" diff --git a/libraries/microsoft-agents-storage-blob/pyproject.toml b/libraries/microsoft-agents-storage-blob/pyproject.toml index b415a4e05..93d88e14c 100644 --- a/libraries/microsoft-agents-storage-blob/pyproject.toml +++ b/libraries/microsoft-agents-storage-blob/pyproject.toml @@ -20,4 +20,4 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol" +"Homepage" = "https://github.com/microsoft/Agents"