Skip to content

Commit db356dd

Browse files
authored
Merge pull request #141 from microsoftgraph/task/kiota-core-dependency
Task/kiota core dependency
2 parents 0b811fb + b576910 commit db356dd

32 files changed

+918
-1731
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
python-version: [3.5, 3.6, 3.7, 3.8]
15+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
1616

1717
steps:
1818
- uses: actions/checkout@v2

.vscode/settings.json

-7
This file was deleted.

Pipfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages] # Packages required to run the application
7-
microsoft-kiota-http = "*"
7+
microsoft-kiota-abstractions = "==0.1.0"
8+
microsoft-kiota-http = "==0.2.0"
9+
microsoft-kiota-authentication-azure = "==0.1.0"
810
httpx = {version = "==0.23.0", extras = ["http2"]}
911

1012
[dev-packages] # Packages required to develop the application
@@ -17,7 +19,8 @@ pytest = "==7.1.3"
1719
pytest-cov = "==4.0.0"
1820
types-python-dateutil = "*"
1921
toml = "==0.10.2"
20-
pytest-asyncio = "==0.19.0"
22+
pytest-trio = "==0.7.0"
2123
pytest-mock = "==3.10.0"
2224
asyncmock = "==0.4.2"
2325
azure-identity = "*"
26+
trio = "==0.22.0"

Pipfile.lock

+494-111
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

msgraph/core/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
from ._client_factory import HTTPClientFactory
65
from ._constants import SDK_VERSION
76
from ._enums import APIVersion, NationalClouds
8-
from ._graph_client import GraphClient
7+
from .base_graph_request_adapter import BaseGraphRequestAdapter
8+
from .graph_client_factory import GraphClientFactory
99

1010
__version__ = SDK_VERSION

msgraph/core/_client_factory.py

-94
This file was deleted.

msgraph/core/_graph_client.py

-176
This file was deleted.
+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import httpx
2+
from kiota_abstractions.authentication import AuthenticationProvider
3+
from kiota_abstractions.serialization import (
4+
ParseNodeFactory,
5+
ParseNodeFactoryRegistry,
6+
SerializationWriterFactory,
7+
SerializationWriterFactoryRegistry,
8+
)
9+
from kiota_http.httpx_request_adapter import HttpxRequestAdapter
10+
11+
from .graph_client_factory import GraphClientFactory
12+
13+
14+
class BaseGraphRequestAdapter(HttpxRequestAdapter):
15+
16+
def __init__(
17+
self,
18+
authentication_provider: AuthenticationProvider,
19+
parse_node_factory: ParseNodeFactory = ParseNodeFactoryRegistry(),
20+
serialization_writer_factory:
21+
SerializationWriterFactory = SerializationWriterFactoryRegistry(),
22+
http_client: httpx.AsyncClient = GraphClientFactory.create_with_default_middleware()
23+
) -> None:
24+
super().__init__(
25+
authentication_provider=authentication_provider,
26+
parse_node_factory=parse_node_factory,
27+
serialization_writer_factory=serialization_writer_factory,
28+
http_client=http_client
29+
)

0 commit comments

Comments
 (0)