refactor: create orchestrate and serve modules (#4168)

cli/api.py

@@ -1,4 +1,4 @@
-from jina.peapods.runtimes.head import HeadRuntime
+from jina.serve.runtimes.head import HeadRuntime
 
 if False:
     from argparse import Namespace
@@ -10,7 +10,7 @@ def pod(args: 'Namespace'):
 
     :param args: arguments coming from the CLI.
     """
-    from jina.peapods.pods import Pod
+    from jina.orchestrate.pods import Pod
 
     try:
         with Pod(args) as p:
@@ -25,7 +25,7 @@ def pea(args: 'Namespace'):
 
     :param args: arguments coming from the CLI.
     """
-    from jina.peapods.peas.factory import PeaFactory
+    from jina.orchestrate.peas.factory import PeaFactory
 
     try:
         with PeaFactory.build_pea(args) as p:
@@ -40,7 +40,7 @@ def executor_native(args: 'Namespace'):
 
     :param args: arguments coming from the CLI.
     """
-    from jina.peapods.runtimes.worker import WorkerRuntime
+    from jina.serve.runtimes.worker import WorkerRuntime
 
     if args.runtime_cls == 'WorkerRuntime':
         runtime_cls = WorkerRuntime
@@ -81,7 +81,7 @@ def worker_runtime(args: 'Namespace'):
 
     :param args: arguments coming from the CLI.
     """
-    from jina.peapods.runtimes.worker import WorkerRuntime
+    from jina.serve.runtimes.worker import WorkerRuntime
 
     with WorkerRuntime(args) as runtime:
         runtime.logger.success(
@@ -97,7 +97,7 @@ def gateway(args: 'Namespace'):
     :param args: arguments coming from the CLI.
     """
     from jina.enums import GatewayProtocolType
-    from jina.peapods.runtimes import get_runtime
+    from jina.serve.runtimes import get_runtime
 
     gateway_runtime_dict = {
         GatewayProtocolType.GRPC: 'GRPCGatewayRuntime',

daemon/api/dependencies.py

@@ -8,8 +8,8 @@
 from pydantic import FilePath
 from pydantic.errors import PathNotAFileError
 
-from jina.peapods.peas.container_helper import get_gpu_device_requests
-from jina.peapods.peas.helper import update_runtime_cls
+from jina.orchestrate.peas.container_helper import get_gpu_device_requests
+from jina.orchestrate.peas.helper import update_runtime_cls
 from jina import Flow
 from jina.enums import (
     RemoteWorkspaceState,

daemon/stores/partial.py

@@ -4,10 +4,10 @@
 from typing import Dict, Optional, Type, Union
 
 from jina.helper import colored, random_port
-from jina.peapods.pods import Pod
-from jina.peapods.peas.factory import PeaFactory
-from jina.peapods import BasePod, BasePea
-from jina.peapods.peas.helper import update_runtime_cls
+from jina.orchestrate.pods import Pod, BasePod
+from jina.orchestrate.peas.factory import PeaFactory
+from jina.orchestrate.peas import BasePea
+from jina.orchestrate.peas.helper import update_runtime_cls
 from jina import Flow, __docker_host__
 from jina.logging.logger import JinaLogger
 

jina/__init__.py

@@ -198,12 +198,12 @@ def _set_nofile(nofile_atleast=4096):
 from docarray import Document, DocumentArray
 
 # Executor
-from jina.executors import BaseExecutor as Executor
-from jina.executors.decorators import requests
+from jina.serve.executors import BaseExecutor as Executor
+from jina.serve.executors.decorators import requests
 
 # Flow
-from jina.flow.base import Flow
-from jina.flow.asyncio import AsyncFlow
+from jina.orchestrate.flow.base import Flow
+from jina.orchestrate.flow.asyncio import AsyncFlow
 
 __all__ = [_s for _s in dir() if not _s.startswith('_')]
 __all__.extend(_names_with_underscore)

jina/checker.py

@@ -14,7 +14,7 @@ def __init__(self, args: 'argparse.Namespace'):
         """
 
         from jina.logging.profile import TimeContext
-        from jina.peapods.runtimes.worker import WorkerRuntime
+        from jina.serve.runtimes.worker import WorkerRuntime
         import time
 
         ctrl_addr = f'{args.host}:{args.port}'

jina/clients/base/grpc.py

@@ -9,7 +9,7 @@
 from jina.excepts import BadClient, BadClientInput
 from jina.logging.profile import ProgressBar
 from jina.proto import jina_pb2_grpc
-from jina.peapods.networking import GrpcConnectionPool
+from jina.serve.networking import GrpcConnectionPool
 
 if TYPE_CHECKING:
     from jina.clients.base import InputType, CallbackFnType

jina/clients/base/http.py

@@ -9,7 +9,7 @@
 from jina.importer import ImportExtensions
 from jina.logging.profile import ProgressBar
 from jina.types.request import Request
-from jina.peapods.stream import RequestStreamer
+from jina.serve.stream import RequestStreamer
 from jina.types.request.data import DataRequest
 
 if TYPE_CHECKING:

jina/clients/base/websocket.py

@@ -9,7 +9,7 @@
 from jina.clients.helper import callback_exec
 from jina.importer import ImportExtensions
 from jina.logging.profile import ProgressBar
-from jina.peapods.stream import RequestStreamer
+from jina.serve.stream import RequestStreamer
 from jina.helper import get_or_reuse_loop
 
 if TYPE_CHECKING:

jina/enums.py

@@ -141,7 +141,7 @@ class FlowBuildLevel(BetterEnum):
     """
     The enum for representing a flow's build level.
 
-    Some :class:`jina.flow.Flow` class functions require certain build level to run.
+    Some :class:`jina.orchestrate.flow.Flow` class functions require certain build level to run.
     """
 
     EMPTY = 0  #: Nothing is built

jina/helper.py

@@ -718,7 +718,7 @@ def kwargs2list(kwargs: Dict) -> List[str]:
         :return: argument list
         """
         args = []
-        from jina.executors import BaseExecutor
+        from jina.serve.executors import BaseExecutor
 
         for k, v in kwargs.items():
             k = k.replace('_', '-')

jina/jaml/__init__.py

@@ -592,7 +592,7 @@ def _delitem(
                     else None,
                 )
 
-            from jina.flow.base import Flow
+            from jina.orchestrate.flow.base import Flow
 
             if issubclass(cls, Flow):
                 no_tag_yml_copy = copy.copy(no_tag_yml)

jina/jaml/parsers/__init__.py

@@ -12,8 +12,8 @@ def _get_all_parser(cls: Type['JAMLCompatible']):
     :param cls: target class
     :return: a tuple of two elements; first is a list of all parsers, second is the legacy parser for default fallback
     """
-    from jina.executors import BaseExecutor
-    from jina.flow.base import Flow
+    from jina.serve.executors import BaseExecutor
+    from jina.orchestrate.flow.base import Flow
 
     if issubclass(cls, Flow):
         return _get_flow_parser()

jina/jaml/parsers/base.py

@@ -1,8 +1,8 @@
 from typing import Dict, Union, TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from jina.flow.base import Flow
-    from jina.executors import BaseExecutor
+    from jina.orchestrate.flow.base import Flow
+    from jina.serve.executors import BaseExecutor
 
 
 class VersionedYAMLParser:

jina/jaml/parsers/executor/legacy.py

@@ -3,8 +3,8 @@
 from typing import Dict, Type, Set
 
 from jina.jaml.parsers.base import VersionedYAMLParser
-from jina.executors import BaseExecutor
-from jina.executors.metas import get_default_metas
+from jina.serve.executors import BaseExecutor
+from jina.serve.executors.metas import get_default_metas
 
 
 class LegacyParser(VersionedYAMLParser):

jina/jaml/parsers/flow/legacy.py

@@ -2,7 +2,7 @@
 
 from jina.jaml.parsers.base import VersionedYAMLParser
 from jina.enums import PodRoleType
-from jina.flow.base import Flow
+from jina.orchestrate.flow.base import Flow
 from jina.helper import expand_env_var, ArgNamespace
 from jina.parsers import set_gateway_parser, set_pod_parser
 

jina/flow/asyncio.py → jina/orchestrate/flow/asyncio.py

@@ -1,4 +1,4 @@
-from jina.flow.base import Flow
+from jina.orchestrate.flow.base import Flow
 from jina.clients.mixin import AsyncPostMixin
 
 

jina/flow/base.py → jina/orchestrate/flow/base.py

@@ -24,7 +24,7 @@
     TYPE_CHECKING,
 )
 
-from jina.flow.builder import allowed_levels, _hanging_pods
+from jina.orchestrate.flow.builder import allowed_levels, _hanging_pods
 from jina import __default_host__, helper
 from jina.clients import Client
 from jina.clients.mixin import AsyncPostMixin, PostMixin
@@ -33,7 +33,6 @@
     PodRoleType,
     FlowInspectType,
     GatewayProtocolType,
-    PollingType,
 )
 from jina.excepts import FlowTopologyError, FlowMissingPodError, RuntimeFailToStart
 from jina.helper import (
@@ -49,7 +48,7 @@
 from jina.logging.logger import JinaLogger
 from jina.parsers import set_gateway_parser, set_pod_parser, set_client_cli_parser
 from jina.parsers.flow import set_flow_parser
-from jina.peapods import Pod
+from jina.orchestrate.pods import Pod
 
 __all__ = ['Flow']
 
@@ -63,9 +62,9 @@ class FlowType(type(ExitStack), type(JAMLCompatible)):
 _regex_port = r'(.*?):([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$'
 
 if TYPE_CHECKING:
-    from jina.executors import BaseExecutor
+    from jina.serve.executors import BaseExecutor
     from jina.clients.base import BaseClient
-    from jina.flow.asyncio import AsyncFlow
+    from jina.orchestrate.flow.asyncio import AsyncFlow
 
 GATEWAY_NAME = 'gateway'
 FALLBACK_PARSERS = [
@@ -349,7 +348,7 @@ def _update_args(self, args, **kwargs):
         if self._common_kwargs.get('asyncio', False) and not isinstance(
             self, AsyncPostMixin
         ):
-            from jina.flow.asyncio import AsyncFlow
+            from jina.orchestrate.flow.asyncio import AsyncFlow
 
             self.__class__ = AsyncFlow
 
@@ -448,8 +447,8 @@ def _get_pod_addresses(self) -> Dict[str, List[str]]:
 
     def _get_k8s_pod_addresses(self, k8s_namespace: str) -> Dict[str, List[str]]:
         graph_dict = {}
-        from jina.peapods.networking import K8sGrpcConnectionPool
-        from jina.peapods.pods.config.helper import to_compatible_name
+        from jina.serve.networking import K8sGrpcConnectionPool
+        from jina.orchestrate.pods.config.helper import to_compatible_name
 
         for node, v in self._pod_nodes.items():
             if node == 'gateway':
@@ -465,8 +464,8 @@ def _get_k8s_pod_addresses(self, k8s_namespace: str) -> Dict[str, List[str]]:
 
     def _get_docker_compose_pod_addresses(self) -> Dict[str, List[str]]:
         graph_dict = {}
-        from jina.peapods.pods.config.docker_compose import PORT_IN
-        from jina.peapods.pods.config.helper import to_compatible_name
+        from jina.orchestrate.pods.config.docker_compose import PORT_IN
+        from jina.orchestrate.pods.config.helper import to_compatible_name
 
         for node, v in self._pod_nodes.items():
             if node == 'gateway':
@@ -1696,7 +1695,7 @@ def to_k8s_yaml(
         if self._build_level.value < FlowBuildLevel.GRAPH.value:
             self.build(copy_flow=False)
 
-        from jina.peapods.pods.config.k8s import K8sPodConfig
+        from jina.orchestrate.pods.config.k8s import K8sPodConfig
 
         k8s_namespace = k8s_namespace or self.args.name or 'default'
 
@@ -1736,7 +1735,7 @@ def to_docker_compose_yaml(
         output_path = output_path or 'docker-compose.yml'
         network_name = network_name or 'jina-network'
 
-        from jina.peapods.pods.config.docker_compose import DockerComposeConfig
+        from jina.orchestrate.pods.config.docker_compose import DockerComposeConfig
 
         docker_compose_dict = {
             'version': '3.3',

jina/flow/builder.py → jina/orchestrate/flow/builder.py

@@ -5,7 +5,7 @@
 
 # noinspection PyUnreachableCode
 if TYPE_CHECKING:
-    from jina.flow.base import Flow
+    from jina.orchestrate.flow.base import Flow
     from jina.enums import FlowBuildLevel
 
 

jina/peapods/peas/__init__.py → jina/orchestrate/peas/__init__.py

@@ -6,9 +6,9 @@
 from abc import ABC, abstractmethod
 from typing import Type, Union, Dict, Optional
 
-from jina.peapods.runtimes.asyncio import AsyncNewLoopRuntime
+from jina.serve.runtimes.asyncio import AsyncNewLoopRuntime
 from jina.jaml import JAML
-from jina.peapods.peas.helper import _get_event, _get_worker, ConditionalEvent
+from jina.orchestrate.peas.helper import _get_event, _get_worker, ConditionalEvent
 from jina import __stop_msg__, __ready_msg__, __windows__
 from jina.enums import PeaRoleType, RuntimeBackendType
 from jina.excepts import RuntimeFailToStart, RuntimeRunForeverEarlyError
@@ -382,8 +382,8 @@ def _terminate(self):
             self.logger.debug(f'runtime thread properly canceled')
 
     def _get_runtime_cls(self) -> AsyncNewLoopRuntime:
-        from jina.peapods.peas.helper import update_runtime_cls
-        from jina.peapods.runtimes import get_runtime
+        from jina.orchestrate.peas.helper import update_runtime_cls
+        from jina.serve.runtimes import get_runtime
 
         update_runtime_cls(self.args)
         return get_runtime(self.args.runtime_cls)

jina/peapods/peas/container.py → jina/orchestrate/peas/container.py

@@ -11,16 +11,16 @@
 
 from jina import __windows__
 from jina.importer import ImportExtensions
-from jina.peapods.peas import BasePea
-from jina.peapods.peas.helper import _get_worker
-from jina.peapods.peas.container_helper import (
+from jina.orchestrate.peas import BasePea
+from jina.orchestrate.peas import _get_worker
+from jina.orchestrate.peas.container_helper import (
     get_gpu_device_requests,
     get_docker_network,
 )
 from jina import __docker_host__
 from jina.logging.logger import JinaLogger
 from jina.helper import slugify, random_name
-from jina.peapods.runtimes.asyncio import AsyncNewLoopRuntime
+from jina.serve.runtimes.asyncio import AsyncNewLoopRuntime
 
 if TYPE_CHECKING:
     from docker.client import DockerClient

jina/peapods/peas/factory.py → jina/orchestrate/peas/factory.py

@@ -3,16 +3,16 @@
 from typing import TYPE_CHECKING, Type
 
 from jina import __default_host__
-from jina.peapods.peas import Pea
-from jina.peapods.peas.jinad import JinaDPea
-from jina.peapods.peas.container import ContainerPea
+from jina.orchestrate.peas import Pea
+from jina.orchestrate.peas.jinad import JinaDPea
+from jina.orchestrate.peas.container import ContainerPea
 from jina.enums import PeaRoleType
 
 from jina.hubble.helper import is_valid_huburi
 from jina.hubble.hubio import HubIO
 
 if TYPE_CHECKING:
-    from jina.peapods.peas import BasePea
+    from jina.orchestrate.peas import BasePea
 
 
 class PeaFactory:

jina/peapods/peas/helper.py → jina/orchestrate/peas/helper.py

@@ -10,7 +10,7 @@
 
 from grpc import RpcError
 
-from jina.peapods.networking import GrpcConnectionPool
+from jina.serve.networking import GrpcConnectionPool
 from jina.types.request.control import ControlRequest
 
 if TYPE_CHECKING:

jina/peapods/peas/jinad.py → jina/orchestrate/peas/jinad.py

@@ -6,8 +6,8 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Dict, List, Union, Optional
 
-from jina.peapods.peas import BasePea
-from jina.peapods.peas.helper import _get_worker, is_ready
+from jina.orchestrate.peas import BasePea
+from jina.orchestrate.peas.helper import _get_worker, is_ready
 from jina.helper import run_async
 from jina.jaml.helper import complete_path
 from jina.importer import ImportExtensions