-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update test_agents_client.py, test_agents_client_async.py, and conftest.py #38656
base: feature/azure-ai-projects-b2
Are you sure you want to change the base?
Conversation
* Removed enterprise and add installation for tracing * clean up * resolved comments
Co-authored-by: Marko Hietala <[email protected]>
* fix(pylint): Resolve R1705(no-else-return) * fix(pylint): Resolve C0207(use-maxsplit-arg) * fix(pylint): Resolve C0412(ungrouped-imports) * fix(pylint): Resolve W1401(anomalous-backslash-in-string) * fix(pylint): Resolve W0105(pointless-string-statement) * fix(pylint): Ignore W0221(arguments-differ) pylint has an open issue tracking false positives for arguments-differ with overloads in subclasses * fix(pylint): Ignore W0718(broad-exception-caught) * fix(pylint): Ignore E0401(import-error) and E0611(no-name-in-module) * fix(pylint): Ignore C4748(client-accepts-api-verison-keyword) Currently, neither client classes supports overriding the api version * fix(pylint): Ignore W0212(protected-access) * fix(pylint): resolve W0707(raise-missing-from) * fix(pylint): Ignore E1102(not-callable) pylint appears to fail to correctly infer that settings.tracing_implementation actually is callable * fix(pylint): Ignore W0231(super-init-not-called) * fix(pylint): Ignore W0613(unused-argument) * fix(pylint): Ignore W0236(invalid-overriden-method) * fix(pylint): Ignore R0914(too-many-locals) * fix(pylint): Ignore R0902(too-many-instance-attributes) * fix(pylint): Ignore R0915(too-many-statements) * fix(pylint): Ignore R0911(too-many-return-statements)
API change check APIView has identified API level changes in this PR and created following API reviews. |
@microsoft-github-policy-service agree company="Microsoft"
…________________________________
From: microsoft-github-policy-service[bot] ***@***.***>
Sent: Friday, November 22, 2024 3:10 PM
To: Azure/azure-sdk-for-python ***@***.***>
Cc: Sophia Ramsey ***@***.***>; Mention ***@***.***>
Subject: Re: [Azure/azure-sdk-for-python] Update test_agents_client.py, test_agents_client_async.py, and conftest.py (PR #38656)
@sophia-ramsey<https://github.com/sophia-ramsey> please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
@microsoft-github-policy-service agree [company="{your company}"]
Options:
* (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
* (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement
Contribution License Agreement
This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.
1. Definitions.
“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to Microsoft under this Agreement.
“Project” means any of the projects owned or managed by Microsoft and offered under a license
approved by the Open Source Initiative (www.opensource.org<http://www.opensource.org/>).
“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”
“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.
2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.
3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
Should You wish to Submit materials that are not Your original work, You may Submit them separately
to the Project if You (a) retain all copyright and license information that was in the materials as You
received them, (b) in the description accompanying Your Submission, include the phrase “Submission
containing materials of a third party:” followed by the names of the third party and any licenses or other
restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
guidelines concerning Submissions.
4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.
5. Licenses.
* Copyright License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
parties.
* Patent License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.
* Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.
1. Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
You later become aware that would make Your representations in this Agreement inaccurate in any
respect.
3. Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.
4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
defenses of lack of personal jurisdiction and forum non-conveniens.
5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.
—
Reply to this email directly, view it on GitHub<#38656 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/BLIDZ7KQAMSJ726USPWLSAL2B62VLAVCNFSM6AAAAABSKLEYLSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOJVGA3TCMJRG4>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
# These are the user-defined functions that can be called by the agent. | ||
|
||
|
||
def fetch_current_datetime(format: Optional[str] = None) -> str: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can shorten logic here: format: str = "%Y-%m-%d %H:%M:%S"
, then we will not need if ... else.
:return: The merged dictionary. | ||
:rtype: str | ||
""" | ||
merged = dict1.copy() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably, it is not necessary, but let us do a deepcopy in case if we will have the collection as a dictionary value
import copy
...
merged = copy.deepcopy(dict1)
client.agents.delete_agent(agent.id) | ||
print("Deleted agent") | ||
|
||
# test update agent without body: JSON |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us move test descriptions to the docstring:
@agentClientPreparer()
@recorded_by_proxy
def test_update_agent_2(self, **kwargs):
"""test update agent without body: JSON"""
@recorded_by_proxy | ||
def test_update_agent_2(self, **kwargs): | ||
# create client | ||
with self.create_client(**kwargs) as client: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May be we can create utility test, which accepts body?
class TestAgentClient:
# Make body a statuc field to easily take it
BODY = {
"name": "my-agent",
"model": "gpt-4o",
"instructions": "You are helpful agent"
}
def _do_test_update_agent(self, body, **kwargs)
"""Test agent"""
with self.create_client(**kwargs) as client:
assert isinstance(client, AIProjectClient)
# create agent
agent = client.agents.create_agent(body=body)
assert agent.id
print("Created agent, agent ID", agent.id)
# update agent and confirm changes went through
agent = client.agents.update_agent(assistant_id=agent.id, name="my-agent2")
assert agent.name
assert agent.name == "my-agent2"
# delete agent and close client
client.agents.delete_agent(agent.id)
print("Deleted agent")
@agentClientPreparer()
@recorded_by_proxy
def test_update_agent_2(self, **kwargs):
self._do_test_update_agent(TestAgentClient.BODY, **kwargs)
@agentClientPreparer()
@recorded_by_proxy
def test_update_agent_as_json(self, **kwargs):
self._do_test_update_agent(json.dumps(TestAgentClient.BODY), **kwargs)
@agentClientPreparer()
@recorded_by_proxy
def test_update_agent_as_bin(self, **kwargs):
self._do_test_update_agent(json.dumps(TestAgentClient.BODY).encode('utf-8'), **kwargs)
"role": "user", | ||
"content": "Hello, tell me a joke" | ||
} | ||
binary_body = json.dumps(body).encode("utf-8") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us also use utility method here, because we only change the way body is being encoded.
@agentClientPreparer() | ||
@recorded_by_proxy_async | ||
async def test_update_message_with_body(self, **kwargs): | ||
# create client |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us use utility test with different body encodings
@agentClientPreparer() | ||
@recorded_by_proxy_async | ||
async def test_create_run_with_iobytes(self, **kwargs): | ||
# create client |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us use utility test with different body encodings
@agentClientPreparer() | ||
@recorded_by_proxy_async | ||
async def test_submit_tool_outputs_to_run(self, **kwargs): | ||
async def test_update_run_with_body(self, **kwargs): | ||
# create client |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us use utility test with different body encodings
@pytest.mark.skip("File ID issues with sanitization.") | ||
@recorded_by_proxy_async | ||
async def test_submit_tool_outputs_to_run_with_body(self, **kwargs): | ||
# create client |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us use utility test with different body encodings
@agentClientPreparer() | ||
@recorded_by_proxy_async | ||
async def test_create_thread_and_run_with_body(self, **kwargs): | ||
# time.sleep(26) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let us use utility test with different body encodings
Description
with self.create_client() as client:
instead of creating and deleting the client in each function