0.13.0rc9

Author: yashbonde

nbox/jobs.py

@@ -17,7 +17,7 @@
 from nbox.hyperloop.jobs.job_pb2 import Job
 from nbox.nbxlib.serving import serve_operator
 
-from nbox.lmao import ExperimentConfig, LiveConfig, LMAO_RM_PREFIX, LMAO_SERVING_FILE
+from nbox.lmao_v4 import ExperimentConfig, LMAO_RM_PREFIX
 from nbox.projects import Project, ProjectState
 
 # Manager

nbox/lib/dist.py

@@ -173,6 +173,12 @@ def to_dict(self):
       "save_to_relic": self.save_to_relic,
       "enable_system_monitoring": self.enable_system_monitoring,
     }
+  
+  @classmethod
+  def from_dict(cls, data):
+    if not isinstance(data, Resource):
+      data["resource"] = resource_from_dict(data["resource"])
+    return cls(**data)
 
   def to_json(self):
     return json.dumps(self.to_dict())

nbox/lmao_v4/common.py

@@ -108,7 +108,45 @@ async def who_are_you():
 
   # print all the endpoints
   logger.info(lo("Here are all the endpoints:\n", "\n".join([f"  {route.path}" for route in app.routes])))
-  uvicorn.run(app, host = host, port = port)
+
+  # run the server with uvicorn and 
+  uvicorn.run(
+    app,
+    host = host,
+    port = port,
+    log_config = {
+      "version": 1,
+      "disable_existing_loggers": False,
+      "formatters": {
+          "default": {
+              "()": "uvicorn.logging.DefaultFormatter",
+              "fmt": "%(levelprefix)s %(message)s",
+              "use_colors": None,
+          },
+          "access": {
+              "()": "uvicorn.logging.AccessFormatter",
+              "fmt": '%(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s',  # noqa: E501
+          },
+      },
+      "handlers": {
+          "default": {
+              "formatter": "default",
+              "class": "logging.StreamHandler",
+              "stream": "ext://sys.stderr",
+          },
+          "access": {
+              "formatter": "access",
+              "class": "logging.StreamHandler",
+              "stream": "ext://sys.stdout",
+          },
+      },
+      "loggers": {
+          "uvicorn": {"handlers": ["default"], "level": "INFO"},
+          "uvicorn.error": {"level": "INFO"},
+          "uvicorn.access": {"handlers": ["access"], "level": "INFO", "propagate": False},
+      },
+    }
+  )
 
 
 def get_fastapi_routes(op: Operator):

nbox/nbxlib/serving.py

@@ -364,20 +364,18 @@ def _upload_job_zip(zip_path: str, job_proto: JobProto, workspace_id: str):
   auth_info = auth_info_pb()
   if new_job:
     logger.info("Creating a new job")
-    mpb.rpc(
-      stub = nbox_grpc_stub.CreateJob,
-      message = JobRequest(job = job_proto, auth_info = auth_info),
-      err_msg = "Failed to create job"
-    )
+    nbox_grpc_stub.CreateJob(JobRequest(
+      job = job_proto,
+      auth_info = auth_info
+    ))
 
   if not old_job_proto.feature_gates:
     logger.info("Updating feature gates")
-    mpb.rpc(
-      stub = nbox_grpc_stub.UpdateJob,
-      message = UpdateJobRequest(job = job_proto, update_mask = FieldMask(paths = ["feature_gates"]), auth_info = auth_info),
-      err_msg = "Failed to update job",
-      raise_on_error = False
-    )
+    nbox_grpc_stub.UpdateJob(UpdateJobRequest(
+      job = job_proto,
+      update_mask = FieldMask(paths = ["feature_gates"]),
+      auth_info = auth_info
+    ))
 
   # write out all the commands for this job
   # logger.info("Run is now created, to 'trigger' programatically, use the following commands:")

nbox/network.py

@@ -1,26 +1,27 @@
 import os
 import sys
 import ast
-import json
 import shlex
 import zipfile
-from pprint import pformat
 from subprocess import Popen
 from typing import Tuple, Dict
 
-from google.protobuf import field_mask_pb2
-
-from nbox.utils import logger
 from nbox import utils as U
-from nbox.auth import secret, AuthConfig, auth_info_pb
-from nbox.init import nbox_ws_v1, nbox_model_service_stub
-from nbox import messages as mpb
+from nbox.auth import secret
+from nbox.utils import logger
 from nbox.relics import Relics
+from nbox import messages as mpb
+from nbox.init import nbox_ws_v1
 from nbox.jd_core import Job, Serve, upload_job_folder
-from nbox.hyperloop.deploy import serve_pb2
-from nbox.hyperloop.common.common_pb2 import Resource
+
 from nbox.nbxlib.astea import Astea
 
+from nbox.hyperloop.common.common_pb2 import Resource
+from nbox.lmao_v4 import get_lmao_stub, get_git_details, LMAO_RM_PREFIX, ExperimentConfig, Tracker
+from nbox.lmao_v4.proto.lmao_service_pb2_grpc import LMAOStub
+from nbox.lmao_v4.proto import tracker_pb2 as t_pb
+from nbox.lmao_v4.proto import project_pb2 as p_pb
+
 
 def _parse_job_code(init_path: str, run_kwargs) -> Tuple[str, Dict]:
   # analyse the input file and function, extract the types and build the run_kwargs
@@ -59,17 +60,9 @@ def _parse_job_code(init_path: str, run_kwargs) -> Tuple[str, Dict]:
 
 ### ---------------
 # this will be eventually merged with the project in the root scope
-from nbox.init import nbox_ws_v1
-from nbox.utils import logger
-from nbox.auth import secret
-from nbox.relics import Relics
-from nbox import messages as mpb
 
-from nbox.lmao_v4 import get_lmao_stub, get_git_details, LMAO_RM_PREFIX, ExperimentConfig, Tracker
-from nbox.lmao_v4.proto.lmao_service_pb2_grpc import LMAOStub
-from nbox.lmao_v4.proto import tracker_pb2 as t_pb
-from nbox.lmao_v4.proto import project_pb2 as p_pb
 
+_SUPPORTED_SERVER_TYPES = ["fastapi"]
 
 class ProjectState:
   project_id: str = ""
@@ -305,7 +298,7 @@ def run(
     upload_job_folder(
       method = "job",
       init_folder = init_path,
-      id = job.id,
+      project_id = self.project_pb.id,
 
       # pass along the resource requirements
       resource_cpu = resource_cpu,
@@ -325,3 +318,19 @@ def run(
     # finally print the location of the run where the users can track this
     logger.info(f"Run location: {secret.nbx_url}/workspace/{secret.workspace_id}/projects/{self.project_pb.id}#Experiments")
 
+  def serve(
+    self,
+    init_path: str,
+    server_type: str = "fastapi",
+
+    # all the things for resources
+    resource_cpu: str = "",
+    resource_memory: str = "",
+    resource_disk_size: str = "",
+    resource_gpu: str = "",
+    resource_gpu_count: str = "",
+    resource_max_retries: int = 0,
+  ):
+    raise NotImplementedError("This is not implemented yet")
+    if server_type not in _SUPPORTED_SERVER_TYPES:
+      raise ValueError(f"server_type must be one of {_SUPPORTED_SERVER_TYPES}")

nbox/projects.py

@@ -1,4 +1,4 @@
-__version__ = "0.13.0c7"
+__version__ = "0.13.0c9"
 _major, _minor, _patch = __version__.split(".")
 _major = int(_major)
 _minor = int(_minor)

nbox/version.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nbox"
-version = "0.13.0c7"
+version = "0.13.0c9"
 description = "ML Inference 🥶"
 authors = [
   "NBX Research <research@nimblebox.ai>",