Refactor batch processing and git push functionality + use original output directory and enhance push error handling with detailed output

Author: marcarl

exporters/git/batch_processor.py

@@ -55,17 +55,20 @@ def process_files_with_git_batch(json_files, output_dir, verbose, predocs):
                 print(f"Fel vid läsning av {abs_json_file}: {e}")
                 continue
 
-            # Create documents in the cloned repository
-            make_document(data, output_dir, ["git"], True, verbose, True, predocs, True)
+            # Create documents in the cloned repository AND save to original output directory
+            # First convert to absolute path since we changed working directory
+            original_output_dir = Path(original_cwd) / Path(output_dir).name if not Path(output_dir).is_absolute() else Path(output_dir)
+            make_document(data, original_output_dir, ["git"], True, verbose, True, predocs, True)
 
         # Push all commits to target repository
         if verbose:
             print(f"Pushar batch till target repository...")
 
-        subprocess.run(['git', 'push', 'origin', unique_branch],
-                     check=True, capture_output=True, timeout=GIT_TIMEOUT)
-
-        print(f"Batch pushad till target repository som branch '{unique_branch}'")
+        from exporters.git.git_utils import push_to_target_repository
+        if push_to_target_repository(unique_branch, 'origin', verbose):
+            print(f"Batch pushad till target repository som branch '{unique_branch}'")
+        else:
+            print(f"Misslyckades med att pusha batch till target repository")
 
     except subprocess.CalledProcessError as e:
         print(f"Fel vid git batch processing: {e}")

exporters/git/git_utils.py

@@ -432,13 +432,20 @@ def push_to_target_repository(branch_name: str, remote_name: str = 'target', ver
         if verbose:
             print(f"Pushar branch '{branch_name}' till remote '{remote_name}'...")
 
-        subprocess.run(['git', 'push', remote_name, branch_name], 
-                      check=True, capture_output=True, timeout=GIT_TIMEOUT)
-        
-        if verbose:
-            print(f"Lyckades pusha branch '{branch_name}' till {repo_url}")
+        result = subprocess.run(['git', 'push', remote_name, branch_name], 
+                               capture_output=True, text=True, timeout=GIT_TIMEOUT)
 
-        return True
+        if result.returncode == 0:
+            if verbose:
+                print(f"Lyckades pusha branch '{branch_name}' till {repo_url}")
+            return True
+        else:
+            print(f"Push misslyckades med exit code {result.returncode}")
+            if result.stdout:
+                print(f"Git stdout: {result.stdout}")
+            if result.stderr:
+                print(f"Git stderr: {result.stderr}")
+            return False
 
     except subprocess.CalledProcessError as e:
         print(f"Fel vid push till target repository: {e}")

sfs_processor.py

@@ -228,7 +228,9 @@ def _create_markdown_document(data: Dict[str, Any], output_path: Path, git_mode:
     # TODO: markdown_content = convert_tables_in_markdown(markdown_content, verbose)
 
     # Apply temporal processing to handle selex attributes
-    # TODO: markdown_content = apply_temporal(markdown_content, today, verbose=verbose)
+    from datetime import datetime
+    today = datetime.now().strftime('%Y-%m-%d')
+    markdown_content = apply_temporal(markdown_content, today, verbose=verbose)
 
     # Extract amendments for git logic (if needed)
     # TODO: amendments = extract_amendments(data.get('andringsforfattningar', []))