Merge pull request #1506 from Jaseci-Labs/main

Update from main

Author: Jayanaka-98

.github/workflows/release-github.yml

@@ -0,0 +1,30 @@
+name: Create Releases from Specific Subdirectories
+
+on:
+  workflow_dispatch:
+
+jobs:
+  create-github-releases:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Create Releases for Specific Subdirectories
+      run: |
+        # List of subdirectories for which releases need to be created
+        subdirs=("jac" "jac-mtllm" "jac-cloud")
+
+        for dir in "${subdirs[@]}"; do
+          # Extract the directory name as the release name
+          release_name=$(basename "$dir")
+
+          # Get the latest commit hash for this subdirectory
+          release_version=$(git log -n 1 --format=%h -- "$dir")
+
+          # Create a release for the subdirectory with the release version (commit hash)
+          gh release create "$release_name-$release_version" "$dir/*" --title "$release_name" --notes "Release for $release_name version $release_version"
+        done
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -51,8 +51,6 @@ If you would like to use these names or brands, please reach out for approval.
 
 [jaseci]: https://jaseci.org/
 
-## University of Michigan Disclosure
-
 The Jaseci open-source software (OSS) is maintained by [Jaseci Labs, LLC][jaseci] for which the following University of Michigan employees have either an ownership or advisory interest in Jaseci Labs, LLC: Prof. Jason Mars, Prof. Lingjia Tang, and Dr. Yiping Kang.
 
 [jaseci]: https://jaseci.org/

jac-cloud/jac_cloud/jaseci/routers/sso.py

@@ -46,6 +46,8 @@
     "GITHUB": GithubSSO,
     "GITLAB": GitlabSSO,
     "GOOGLE": GoogleSSO,
+    "GOOGLE_ANDROID": GoogleSSO,
+    "GOOGLE_IOS": GoogleSSO,
     "KAKAO": KakaoSSO,
     "LINE": LineSSO,
     "LINKEDIN": LinkedInSSO,
@@ -227,7 +229,7 @@ def register(platform: str, open_id: OpenID) -> Response:
                         }
                     },
                     session=session,
-                ):
+                ).modified_count:
                     root = Root().__jac__
                     ureq: dict[str, object] = User.register_type()(
                         email=open_id.email,

jac-cloud/jac_cloud/jaseci/routers/user.py

@@ -110,11 +110,15 @@ def verify(req: UserVerification) -> ORJSONResponse:
 
 
 @router.post("/login")
-def root(req: UserRequest) -> ORJSONResponse:
+def login(req: UserRequest) -> ORJSONResponse:
     """Login user API."""
+    log = log_entry("login", req.email, {"email": req.email, "password": "****"})
+
     user: BaseUser = User.Collection.find_by_email(req.email)  # type: ignore
     if not user or not pbkdf2_sha512.verify(req.password, user.password):
-        raise HTTPException(status_code=400, detail="Invalid Email/Password!")
+        resp = {"message": "Invalid Email/Password!"}
+        log_exit(resp, log)
+        return ORJSONResponse(resp, 400)
 
     if RESTRICT_UNVERIFIED_USER and not user.is_activated:
         User.send_verification_code(create_code(user.id), req.email)
@@ -126,6 +130,7 @@ def root(req: UserRequest) -> ORJSONResponse:
     user_json = user.serialize()
     token = create_token(user_json)
 
+    log_exit({"token": "****", "user": {**user_json, "state": "****"}}, log)
     return ORJSONResponse(content={"token": token, "user": user_json})
 
 

jac-cloud/jac_cloud/tests/openapi_specs.yaml

@@ -694,7 +694,7 @@ paths:
   /user/login:
     post:
       description: Login user API.
-      operationId: root_user_login_post
+      operationId: login_user_login_post
       requestBody:
         content:
           application/json:
@@ -713,7 +713,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/HTTPValidationError'
           description: Validation Error
-      summary: Root
+      summary: Login
       tags:
       - user
   /user/register:

jac-cloud/setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "0.1.13"
+VERSION = "0.1.16"
 
 setup(
     name="jac-cloud",

jac-mtllm/mtllm/aott.py

@@ -131,7 +131,27 @@ def aott_raise(
         if not (contains_media and not is_custom)
         else meaning_typed_input_list
     )
-    return model(meaning_typed_input, media=media, **model_params)  # type: ignore
+    if is_custom:
+        try:
+            # This is a temporary solution to enable passing in custom
+            # parameters to custom models
+            # custom model should override the __call__ method to
+            # accept function_inputs parameter
+            return model(
+                meaning_typed_input,  # type: ignore
+                media=media,  # type: ignore
+                function_inputs=inputs_information,  # type: ignore
+                **model_params,
+            )
+        except TypeError:
+            # this is for backward compatibility,
+            # for any existing custom models that do not have the
+            # function_inputs parameter
+            return model(
+                meaning_typed_input, media=media, **model_params  # type: ignore
+            )
+    else:
+        return model(meaning_typed_input, media=media, **model_params)  # type: ignore
 
 
 def execute_react(

jac/jaclang/compiler/absyntree.py

@@ -30,6 +30,7 @@
     SymbolType,
 )
 from jaclang.compiler.constant import DELIM_MAP, SymbolAccess, Tokens as Tok
+from jaclang.compiler.py_info import PyInfo
 from jaclang.compiler.semtable import SemRegistry
 from jaclang.utils.treeprinter import dotgen_ast_tree, print_ast_tree
 
@@ -636,11 +637,10 @@ def __init__(
         self.impl_mod: list[Module] = []
         self.test_mod: list[Module] = []
         self.mod_deps: dict[str, Module] = {}
-        self.py_mod_dep_map: dict[str, str] = {}
-        self.py_raise_map: dict[str, str] = {}
         self.registry = registry
         self.terminals: list[Token] = terminals
-        self.is_raised_from_py: bool = False
+        self.py_info: PyInfo = PyInfo()
+
         AstNode.__init__(self, kid=kid)
         AstDocNode.__init__(self, doc=doc)
 
@@ -693,6 +693,19 @@ def unparse(self) -> str:
         super().unparse()
         return self.format()
 
+    @staticmethod
+    def get_href_path(node: AstNode) -> str:
+        """Return the full path of the module that contains this node."""
+        parent = node.find_parent_of_type(Module)
+        mod_list = []
+        if isinstance(node, Module):
+            mod_list.append(node)
+        while parent is not None:
+            mod_list.append(parent)
+            parent = parent.find_parent_of_type(Module)
+        mod_list.reverse()
+        return ".".join(p.name for p in mod_list)
+
 
 class GlobalVars(ElementStmt, AstAccessNode):
     """GlobalVars node type for Jac Ast."""

jac/jaclang/compiler/passes/main/__init__.py

@@ -2,9 +2,9 @@
 
 from .sub_node_tab_pass import SubNodeTabPass
 from .sym_tab_build_pass import SymTabBuildPass  # noqa: I100
+from .def_use_pass import DefUsePass  # noqa: I100
 from .import_pass import JacImportPass, PyImportPass  # noqa: I100
 from .def_impl_match_pass import DeclImplMatchPass  # noqa: I100
-from .def_use_pass import DefUsePass  # noqa: I100
 from .pyout_pass import PyOutPass  # noqa: I100
 from .pyast_load_pass import PyastBuildPass  # type: ignore # noqa: I100
 from .pyast_gen_pass import PyastGenPass  # noqa: I100

jac/jaclang/compiler/passes/main/access_modifier_pass.py

@@ -45,7 +45,7 @@ def exit_node(self, node: ast.AstNode) -> None:  # TODO: Move to debug pass
             settings.lsp_debug
             and isinstance(node, ast.NameAtom)
             and not node.sym
-            and not node.parent_of_type(ast.Module).is_raised_from_py
+            and not node.parent_of_type(ast.Module).py_info.is_raised_from_py
             and not (
                 node.sym_name == "py"
                 and node.parent

jac/jaclang/compiler/passes/main/fuse_typeinfo_pass.py

@@ -77,35 +77,6 @@ def __set_type_sym_table_link(self, node: ast.AstSymbolNode) -> None:
         if typ_sym_table != self.ir.sym_tab:
             node.name_spec.type_sym_tab = typ_sym_table
 
-    def __collect_python_dependencies(self, node: ast.AstNode) -> None:
-        assert isinstance(node, ast.AstSymbolNode)
-        assert isinstance(self.ir, ast.Module)
-
-        mypy_node = node.gen.mypy_ast[0]
-
-        if isinstance(mypy_node, MypyNodes.RefExpr) and mypy_node.node:
-            node_full_name = mypy_node.node.fullname
-            if "." in node_full_name:
-                mod_name = node_full_name[: node_full_name.rindex(".")]
-            else:
-                mod_name = node_full_name
-
-            if mod_name not in self.ir.py_mod_dep_map:
-                self.__debug_print(
-                    f"Can't find a python file associated with {type(node)}::{node.loc}"
-                )
-                return
-
-            mode_path = self.ir.py_mod_dep_map[mod_name]
-            if mode_path.endswith(".jac"):
-                return
-
-            self.ir.py_raise_map[mod_name] = mode_path
-        else:
-            self.__debug_print(
-                f"Collect python dependencies is not supported in {type(node)}::{node.loc}"
-            )
-
     @staticmethod
     def __handle_node(
         func: Callable[[FuseTypeInfoPass, T], None]
@@ -127,7 +98,6 @@ def node_handler(self: FuseTypeInfoPass, node: T) -> None:
                 if len(node.gen.mypy_ast) == 1:
                     func(self, node)
                     self.__set_type_sym_table_link(node)
-                    self.__collect_python_dependencies(node)
 
                 # Jac node has multiple mypy nodes linked to it
                 elif len(node.gen.mypy_ast) > 1:
@@ -151,7 +121,6 @@ def node_handler(self: FuseTypeInfoPass, node: T) -> None:
                         )
                         func(self, node)
                         self.__set_type_sym_table_link(node)
-                        self.__collect_python_dependencies(node)
 
                 # Special handing for BuiltinType
                 elif isinstance(node, ast.BuiltinType):
@@ -536,7 +505,7 @@ def get_type_from_overloaded(
         self, mypy_type: MypyTypes.Overloaded
     ) -> Optional[str]:
         """Get type info from mypy type Overloaded."""
-        return self.__call_type_handler(mypy_type.items[0])
+        return self.__call_type_handler(mypy_type.items[-1])
 
     def get_type_from_none_type(self, mypy_type: MypyTypes.NoneType) -> Optional[str]:
         """Get type info from mypy type NoneType."""
@@ -554,6 +523,12 @@ def get_type_from_type_type(self, mypy_type: MypyTypes.TypeType) -> Optional[str
         """Get type info from mypy type TypeType."""
         return str(mypy_type.item)
 
+    def get_type_from_type_var_type(
+        self, mypy_type: MypyTypes.TypeVarType
+    ) -> Optional[str]:
+        """Get type info from mypy type TypeType."""
+        return str(mypy_type.name)
+
     def exit_assignment(self, node: ast.Assignment) -> None:
         """Add new symbols in the symbol table in case of self."""
         # This will fix adding new items to the class through self
@@ -668,6 +643,13 @@ def exit_atom_trailer(self, node: ast.AtomTrailer) -> None:
                 right.type_sym_tab = type_symtab
 
             else:
+                # Fix the symbolTable linking in case of type annotations
+                if left.type_sym_tab is None and isinstance(node.parent, ast.SubTag):
+                    assert isinstance(left, ast.AstSymbolNode)
+                    left.name_spec.type_sym_tab = self.ir.sym_tab.find_scope(
+                        left.sym_name
+                    )
+
                 if left.type_sym_tab:
                     right.name_spec.sym = left.type_sym_tab.lookup(right.sym_name)
                     if right.name_spec.sym: