update

Author: yushan8

gazelle/python/resolve.go

@@ -71,6 +71,7 @@ func (py *Resolver) Imports(c *config.Config, r *rule.Rule, f *rule.File) []reso
 		}
 		pythonProjectRoot := cfg.PythonProjectRoot()
 		provide := importSpecFromSrc(pythonProjectRoot, f.Pkg, src)
+		// log.Printf("import to index: %v", provide.Imp)
 		provides = append(provides, provide)
 	}
 	if len(provides) == 0 {
@@ -156,46 +157,56 @@ func (py *Resolver) Resolve(
 			mod := it.Value().(module)
 			moduleName := mod.Name
 			// Transform relative imports `.` or `..foo.bar` into the package path from root.
-			if strings.HasPrefix(moduleName, ".") {
-				// If not package generation mode, skip relative imports
+			if strings.HasPrefix(mod.From, ".") {
 				if !isPackageGeneration {
 					continue MODULES_LOOP
 				}
+
+				// Count number of leading dots in mod.From (e.g., ".." = 2, "...foo.bar" = 3)
 				relativeDepth := 0
-				for i := 0; i < len(moduleName); i++ {
-					if moduleName[i] == '.' {
+				for i := 0; i < len(mod.From); i++ {
+					if mod.From[i] == '.' {
 						relativeDepth++
 					} else {
 						break
 					}
 				}
 
-				// Extract suffix after leading dots
-				relativeSuffix := moduleName[relativeDepth:]
-				var relativeSuffixParts []string
-				if relativeSuffix != "" {
-					relativeSuffixParts = strings.Split(relativeSuffix, ".")
+				// Extract final symbol (e.g., "some_function") from mod.Name
+				imported := mod.Name
+				if idx := strings.LastIndex(mod.Name, "."); idx >= 0 {
+					imported = mod.Name[idx+1:]
+				}
+
+				// Optional subpath in 'from' clause, e.g. "from ...my_library.foo import x"
+				fromPath := strings.TrimLeft(mod.From, ".")
+				var fromParts []string
+				if fromPath != "" {
+					fromParts = strings.Split(fromPath, ".")
 				}
 
-				// Split current package label into parts
+				// Current Bazel package as path segments
 				pkgParts := strings.Split(from.Pkg, "/")
 
-				if relativeDepth- 1 > len(pkgParts) {
-					// Trying to go above the root
-					log.Printf("ERROR: Invalid relative import %q in %q: exceeds package root.", moduleName, mod.Filepath)
+				if relativeDepth-1 > len(pkgParts) {
+					log.Printf("ERROR: Invalid relative import %q in %q: exceeds package root.", mod.Name, mod.Filepath)
 					continue MODULES_LOOP
 				}
 
-				// Go up `relativeDepth - 1` levels
+				// Go up relativeDepth - 1 levels
 				baseParts := pkgParts
 				if relativeDepth > 1 {
 					baseParts = pkgParts[:len(pkgParts)-(relativeDepth-1)]
 				}
+				// Build absolute module path
+				absParts := append([]string{}, baseParts...)       // base path
+				absParts = append(absParts, fromParts...)          // subpath from 'from'
+				absParts = append(absParts, imported)              // actual imported symbol
 
-				absParts := append(baseParts, relativeSuffixParts...)
 				moduleName = strings.Join(absParts, ".")
 			}
 
+
 			moduleParts := strings.Split(moduleName, ".")
 			possibleModules := []string{moduleName}
 			for len(moduleParts) > 1 {

gazelle/python/testdata/relative_imports_package_mode/package1/BUILD.out

@@ -3,6 +3,7 @@ load("@rules_python//python:defs.bzl", "py_library")
 py_library(
     name = "package1",
     srcs = [
+        "__init__.py",
         "module1.py",
         "module2.py",
     ],

gazelle/python/testdata/relative_imports_package_mode/package1/__init__.py

@@ -0,0 +1,2 @@
+def some_function():
+    pass

gazelle/python/testdata/relative_imports_package_mode/package1/my_library/BUILD.in

@@ -0,0 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
+py_library(
+    name = "my_library",
+    srcs = ["__init__.py"],
+    visibility = ["//:__subpackages__"],
+)

gazelle/python/testdata/relative_imports_package_mode/package1/my_library/BUILD.out

@@ -0,0 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
+py_library(
+    name = "my_library",
+    srcs = ["__init__.py"],
+    visibility = ["//:__subpackages__"],
+)

gazelle/python/testdata/relative_imports_package_mode/package1/my_library/__init__.py

@@ -0,0 +1,2 @@
+def some_function():
+    return "some_function"

gazelle/python/testdata/relative_imports_package_mode/package1/my_library/foo/BUILD.in

@@ -0,0 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
+py_library(
+    name = "foo",
+    srcs = ["__init__.py"],
+    visibility = ["//:__subpackages__"],
+)

gazelle/python/testdata/relative_imports_package_mode/package1/my_library/foo/BUILD.out

@@ -0,0 +1,2 @@
+def some_function():
+    return "some_function"

gazelle/python/testdata/relative_imports_package_mode/package1/my_library/foo/__init__.py

@@ -0,0 +1,10 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
+py_library(
+    name = "subpackage1",
+    srcs = [
+        "__init__.py",
+        "some_module.py",
+    ],
+    visibility = ["//:__subpackages__"],
+)