Poetry native support improvement (#340)

Author: agrasth

cli/cli.go

@@ -373,26 +373,60 @@ func GetCommands(logger utils.Log) []*clitool.Command {
 			UsageText: "bi poetry",
 			Flags:     flags,
 			Action: func(context *clitool.Context) (err error) {
-				// Use Poetry implementation for proper dependency collection
-				config := flexpack.PoetryConfig{
-					WorkingDirectory:       ".",
-					IncludeDevDependencies: false, // Can be made configurable later
+				// Check if FlexPack implementation should be used
+				if flexpack.IsFlexPackEnabled() {
+					// Use Poetry FlexPack implementation for proper dependency collection
+					config := flexpack.PoetryConfig{
+						WorkingDirectory:       ".",
+						IncludeDevDependencies: false, // Can be made configurable later
+					}
+
+					// Create Poetry instance
+					poetryFlex, err := flexpack.NewPoetryFlexPack(config)
+					if err != nil {
+						return fmt.Errorf("failed to create Poetry instance: %w", err)
+					}
+
+					// Collect build info
+					buildInfo, err := poetryFlex.CollectBuildInfo("poetry-build", "1")
+					if err != nil {
+						return fmt.Errorf("failed to collect build info: %w", err)
+					}
+
+					// Print the build info
+					return printBuildInfo(buildInfo, context.String(formatFlag))
 				}
 
-				// Create Poetry instance
-				poetryFlex, err := flexpack.NewPoetryFlexPack(config)
+				// Use traditional build-info-go implementation
+				service := build.NewBuildInfoService()
+				service.SetLogger(logger)
+				bld, err := service.GetOrCreateBuild("poetry-build", "1")
+				if err != nil {
+					return
+				}
+				defer func() {
+					err = errors.Join(err, bld.Clean())
+				}()
+				pythonModule, err := bld.AddPythonModule("", pythonutils.Poetry)
 				if err != nil {
-					return fmt.Errorf("failed to create Poetry instance: %w", err)
+					return
 				}
-
-				// Collect build info
-				buildInfo, err := poetryFlex.CollectBuildInfo("poetry-build", "1")
+				filteredArgs := filterCliFlags(context.Args().Slice(), flags)
+				if len(filteredArgs) > 0 && (filteredArgs[0] == "install" || filteredArgs[0] == "publish") {
+					err = pythonModule.RunInstallAndCollectDependencies(filteredArgs[1:])
+					if err != nil {
+						return
+					}
+					return printBuild(bld, context.String(formatFlag))
+				} else if len(filteredArgs) > 0 {
+					return exec.Command("poetry", filteredArgs...).Run()
+				}
+				// If no args, just collect dependencies
+				err = pythonModule.RunInstallAndCollectDependencies([]string{})
 				if err != nil {
-					return fmt.Errorf("failed to collect build info: %w", err)
+					return
 				}
-
-				// Print the build info
-				return printBuildInfo(buildInfo, context.String(formatFlag))
+				return printBuild(bld, context.String(formatFlag))
 			},
 		},
 	}

flexpack/poetry_flexpack.go

@@ -29,7 +29,15 @@ type PoetryFlexPack struct {
 }
 
 // PoetryPyProjectToml represents the structure of pyproject.toml file for Poetry
+// Supports both Poetry 1.x format ([tool.poetry]) and Poetry 2.x format ([project])
 type PoetryPyProjectToml struct {
+	// Poetry 2.x format (PEP 621)
+	Project struct {
+		Name         string   `toml:"name"`
+		Version      string   `toml:"version"`
+		Dependencies []string `toml:"dependencies"`
+	} `toml:"project"`
+	// Poetry 1.x format
 	Tool struct {
 		Poetry struct {
 			Name            string                 `toml:"name"`
@@ -194,6 +202,7 @@ func (pf *PoetryFlexPack) CalculateRequestedBy() map[string][]string {
 }
 
 // loadPyProjectToml loads and parses the pyproject.toml file
+// Supports both Poetry 1.x format ([tool.poetry]) and Poetry 2.x format ([project])
 func (pf *PoetryFlexPack) loadPyProjectToml() error {
 	pyprojectPath := filepath.Join(pf.config.WorkingDirectory, "pyproject.toml")
 	data, err := os.ReadFile(pyprojectPath)
@@ -204,8 +213,27 @@ func (pf *PoetryFlexPack) loadPyProjectToml() error {
 	if err := toml.Unmarshal(data, pf.pyprojectData); err != nil {
 		return fmt.Errorf("failed to parse pyproject.toml: %w", err)
 	}
+
+	// Try Poetry 1.x format first ([tool.poetry])
 	pf.projectName = pf.pyprojectData.Tool.Poetry.Name
 	pf.projectVersion = pf.pyprojectData.Tool.Poetry.Version
+
+	// Fallback to Poetry 2.x / PEP 621 format ([project])
+	if pf.projectName == "" {
+		pf.projectName = pf.pyprojectData.Project.Name
+	}
+	if pf.projectVersion == "" {
+		pf.projectVersion = pf.pyprojectData.Project.Version
+	}
+
+	// Validate that we found name and version
+	if pf.projectName == "" {
+		return fmt.Errorf("project name not found in pyproject.toml (checked [tool.poetry.name] and [project.name])")
+	}
+	if pf.projectVersion == "" {
+		return fmt.Errorf("project version not found in pyproject.toml (checked [tool.poetry.version] and [project.version])")
+	}
+
 	return nil
 }