Axsuarez/organization refactor (#70)

axelsrz · = · commit 0ff3b136cbce · 2025-07-24T11:37:50.000-07:00
* removing intermediate folders

* consolidating libraries and renaming

* Restructuring and naming done. Exporting improvement pending.

* Restructuring and naming done. Exporting improvement pending. --formatting

* ADO Pipeline fix

* Exporting top level classes

* Updating samples

* Integration fixes

* Samples updates

* Description updates
diff --git 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/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,9 @@
 from typing import Dict, List, Optional
+<<<<<<< HEAD
 from microsoft.agents.hosting.core import (
+=======
+from microsoft.agents.hosting.core.authorization import (
+>>>>>>> 9df9e21 (Axsuarez/organization refactor (#70))
     AgentAuthConfiguration,
     AccessTokenProviderBase,
     ClaimsIdentity,
diff --git 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
@@ -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
@@ -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
@@ -5,7 +5,11 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "microsoft-agents-hosting-core"
 version = "0.0.0a1"
+<<<<<<< HEAD
 description = "A protocol library for Microsoft Agents"
+=======
+description = "Core library for Microsoft Agents"
+>>>>>>> 9df9e21 (Axsuarez/organization refactor (#70))
 authors = [{name = "Microsoft Corporation"}]
 requires-python = ">=3.9"
 classifiers = [
@@ -22,4 +26,8 @@ dependencies = [
 ]
 
 [project.urls]
+<<<<<<< HEAD
 "Homepage" = "https://github.com/microsoft/microsoft-agents-protocol"
+=======
+"Homepage" = "https://github.com/microsoft/Agents"
+>>>>>>> 9df9e21 (Axsuarez/organization refactor (#70))
diff --git 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
@@ -20,4 +20,8 @@ dependencies = [
 ]
 
 [project.urls]
+<<<<<<< HEAD
 "Homepage" = "https://github.com/microsoft/microsoft-agents-protocol"
+=======
+"Homepage" = "https://github.com/microsoft/Agents"
+>>>>>>> 9df9e21 (Axsuarez/organization refactor (#70))
diff --git 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
@@ -7,12 +7,18 @@
 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,
     start_agent_process,
 )
+from microsoft.agents.hosting.core import (
+    Authorization,
+    AgentApplication,
+    TurnState,
+    TurnContext,
+    MemoryStorage,
 from microsoft.agents.hosting.core import (
     Authorization,
     AgentApplication,
@@ -23,7 +29,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)
 
@@ -34,6 +40,7 @@
 
 AGENT_APP = AgentApplication[TurnState](
     storage=STORAGE, adapter=ADAPTER, authorization=AUTHORIZATION, **agents_sdk_config
+    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
@@ -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
@@ -2,21 +2,31 @@
 # 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
 
+from microsoft.agents.hosting.core import (
+    Authorization,
+    AgentApplication,
+    TurnState,
 from microsoft.agents.hosting.core import (
     Authorization,
     AgentApplication,
     TurnState,
     TurnContext,
     MemoryStorage,
+    MemoryStorage,
+)
+from microsoft.agents.activity import (
+    load_configuration_from_env,
+    Activity,
+    ActivityTypes,
+    SensitivityUsageInfo,
 )
 from microsoft.agents.activity import (
     load_configuration_from_env,
@@ -27,7 +37,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
@@ -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()
 
 

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ dependencies = [`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`[project.urls]`
`24`		`-"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol"`
	`24`	`+"Homepage" = "https://github.com/microsoft/Agents"`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@ dependencies = [`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`[project.urls]`
`21`		`-"Homepage" = "https://github.com/yourusername/microsoft-agents-client"`
	`21`	`+"Homepage" = "https://github.com/microsoft/Agents"`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,8 @@ dependencies = [`
`20`	`20`	`]`
`21`	`21`
`22`	`22`	`[project.urls]`
	`23`	`+<<<<<<< HEAD`
`23`	`24`	`"Homepage" = "https://github.com/microsoft/microsoft-agents-protocol"`
	`25`	`+=======`
	`26`	`+"Homepage" = "https://github.com/microsoft/Agents"`
	`27`	`+>>>>>>> 9df9e21 (Axsuarez/organization refactor (#70))`