Skip to content

feat: allow to override the api creation function in gnetcli fetcher and deployer #76

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.

Sign up for GitHub

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

Merged
yoptar merged 1 commit into from
Nov 26, 2025
Merged

feat: allow to override the api creation function in gnetcli fetcher and deployer #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions src/gnetcli_adapter/gnetcli_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import abc
import traceback

import asyncio
Expand Down Expand Up @@ -142,8 +143,21 @@ def get_device_ip(dev: Device) -> Optional[str]:
_logger.warning("get device ip error: %s", e)
return None

class ApiMaker(metaclass=abc.ABCMeta):
conf: AppSettings

@asynccontextmanager
async def make_api(self) -> AsyncIterator[Gnetcli]:
async with GnetcliStarter(self.conf.server_path, self.conf.server_conf) as gnetcli_url:
yield Gnetcli(
server=gnetcli_url,
auth_token=self.conf.make_server_credentials(),
insecure_grpc=self.conf.insecure_grpc,
user_agent="annet",
)


class GnetcliFetcher(Fetcher, AdapterWithConfig, AdapterWithName):
class GnetcliFetcher(Fetcher, AdapterWithConfig, AdapterWithName, ApiMaker):
def __init__(
self,
url: Optional[str] = None,
Expand Down Expand Up @@ -190,7 +204,7 @@ async def fetch(
):
if not devices:
return {}, {}
async with make_api(self.conf) as api:
async with self.make_api() as api:
return await self._fetch(api, devices, files_to_download, processes, max_slots)

async def _fetch(
Expand Down Expand Up @@ -282,18 +296,7 @@ def parse_annet_qa(qa: list[annet.annlib.command.Question]) -> list[QA]:
return res


@asynccontextmanager
async def make_api(conf: AppSettings) -> AsyncIterator[Gnetcli]:
async with GnetcliStarter(conf.server_path, conf.server_conf) as gnetcli_url:
yield Gnetcli(
server=gnetcli_url,
auth_token= conf.make_server_credentials(),
insecure_grpc=conf.insecure_grpc,
user_agent="annet",
)


class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName, ApiMaker):
def __init__(
self,
url: Optional[str] = None,
Expand Down Expand Up @@ -335,7 +338,7 @@ async def bulk_deploy(
) -> DeployResult:
if not deploy_cmds:
return DeployResult(hostnames=[], results={}, durations={}, original_states={})
async with make_api(self.conf) as api:
async with self.make_api() as api:
return await self._bulk_deploy(
api=api,
deploy_cmds=deploy_cmds,
Expand Down