Update handler.py

handler.py

@@ -59,46 +59,54 @@ def make_dir_executable(dir_path: Path):
 make_dir_executable(ALIGNER_SCRIPT_DIR)
 
 
-def create_github_repo(repo_path: Path, repo_name: str):
+def create_github_repo(repo_path: Path, repo_name: str, version: str, realign: bool):
     logging.info("[INFO] Creating GitHub repo...")
 
-    # configure git users
+    # Configure git users
     subprocess.run(f"git config --global user.name {GITHUB_USERNAME}".split())
     subprocess.run(f"git config --global user.email {GITHUB_EMAIL}".split())
 
     # Initialize a Git repository
-    subprocess.run(f"git init {quiet}".split(), cwd=str(repo_path))
+    subprocess.run(f"git init".split(), cwd=str(repo_path))
 
     # Commit the changes
-    subprocess.run("git add . ".split(), cwd=str(repo_path))
-    subprocess.run(
-        f"git commit {quiet} -m".split() + ["Initial commit"], cwd=str(repo_path)
-    )
-
-    # Create a new repository on GitHub
-    response = requests.post(
-        GITHUB_API_ENDPOINT,
-        json={
-            "name": repo_name,
-            "private": True,
-        },
-        auth=(GITHUB_USERNAME, GITHUB_ACCESS_TOKEN),
-    )
-    response.raise_for_status()
+    subprocess.run("git add .".split(), cwd=str(repo_path))
+    commit_message = "Initial commit" if not realign else f"Commit for version {version}"
+    subprocess.run(f"git commit -m".split() + [commit_message], cwd=str(repo_path))
+
+    # Check if realigning
+    if realign:
+        if version:
+            # Checkout the new branch
+            subprocess.run(f"git checkout -b {version}".split(), cwd=str(repo_path))
+        else:
+            logging.error("Version not specified for realignment.")
+            return
+    else:
+        # Create a new repository on GitHub
+        response = requests.post(
+            GITHUB_API_ENDPOINT,
+            json={
+                "name": repo_name,
+                "private": True,
+            },
+            auth=(GITHUB_USERNAME, GITHUB_ACCESS_TOKEN),
+        )
+        response.raise_for_status()
 
-    time.sleep(3)
+        time.sleep(3)
 
-    # Add the GitHub remote to the local Git repository and push the changes
-    remote_url = f"https://{GITHUB_ORG}:{GITHUB_ACCESS_TOKEN}@github.com/{GITHUB_ORG}/{repo_name}.git"
+    # Add the GitHub remote to the local Git repository
+    remote_url = f"https://{GITHUB_USERNAME}:{GITHUB_ACCESS_TOKEN}@github.com/{GITHUB_ORG}/{repo_name}.git"
     subprocess.run(
         f"git remote add origin {remote_url}", cwd=str(repo_path), shell=True
     )
-    # rename default branch to main
-    subprocess.run("git branch -M main".split(), cwd=str(repo_path))
-    subprocess.run(f"git push {quiet} -u origin main".split(), cwd=str(repo_path))
 
-    return response.json()["html_url"]
+    # Push the changes to the appropriate branch
+    branch_name = version if realign else "main"
+    subprocess.run(f"git push -u origin {branch_name}".split(), cwd=str(repo_path))
 
+    return f"Branch '{branch_name}' updated in {repo_name}" if realign else response.json()["html_url"]
 
 def convert_raw_align_to_tm(align_fn: Path, tm_path: Path):
     if DEBUG:
@@ -116,10 +124,6 @@ def convert_raw_align_to_tm(align_fn: Path, tm_path: Path):
     
             # Read and log the content of the file
             content = fn.read_text()
-            if content:
-                logging.info(f"Content length of {fn.name}: {len(content)} characters") # Log first 100 characters
-            else:
-                logging.warning(f"File is empty: {fn}")
     
         except Exception as e:
             logging.error(f"Error while reading file {fn}: {e}")
@@ -201,9 +205,17 @@ def add_to_publish_todo_repo(org, repo_name, file_path, access_token):
         print(f"[ERROR] Response: {response.text}")
 
 
-def create_tm(align_fn: Path, text_pair: Dict[str, str]):
+def create_tm(align_fn: Path, text_pair):
     align_fn = Path(align_fn)
     text_id = text_pair["text_id"]
+    try:
+            
+        version= text_pair["version"]
+        realign=text_pair["realign"]
+    except:
+        version=""
+        realign=False
+        
     with tempfile.TemporaryDirectory() as tmp_dir:
         output_dir = Path(tmp_dir)
         repo_name = f"TM{text_id}"
@@ -211,12 +223,12 @@ def create_tm(align_fn: Path, text_pair: Dict[str, str]):
         tm_path.mkdir(exist_ok=True, parents=True)
         repo_path = convert_raw_align_to_tm(align_fn, tm_path)
         repo_path = add_input_in_readme(text_pair, tm_path)
-        repo_url = create_github_repo(repo_path, repo_name)
+        repo_url = create_github_repo(repo_path, repo_name,version,realign)
         logging.info(f"TM repo created: {repo_url}")
         add_to_publish_todo_repo(GITHUB_ORG, MAI_TM_PUBLISH_TODO_REPO, repo_name, GITHUB_ACCESS_TOKEN)
     return repo_url
 
-##----------------------- MAIN -----------------------##
+##--------------------------------------------- MAIN -----------------------##
 
 
 @contextmanager
@@ -287,7 +299,6 @@ def _run_align_script(bo_fn, en_fn, output_dir):
         content = output_fn.read_text()
         if content:
             logging.info(f"Length of content in bo.tx.clean{output_fn}: {len(content)}") 
-            logging.info(f"Contents of {output}: {output.stdout}")
         else:
             logging.warning(f"The file {output_fn} is empty.")
     else:
@@ -318,13 +329,10 @@ def align(text_pair):
             return {"error": "Failed to download English file or file is empty"}
 
         # Log content of files for verification
-        logging.info(f"Content of {bo_fn.name}: {bo_fn.read_text()[:100]}...")
-        logging.info(f"Content of {en_fn.name}: {en_fn.read_text()[:100]}...")
-
         # Run alignment script
+
         try:
             aligned_fn = _run_align_script(bo_fn, en_fn, output_dir)
-            logging.info(f"Alignment script output file: {aligned_fn}")
         except Exception as e:
             logging.error(f"Alignment script error: {e}")
             return {"error": f"Alignment script failed: {e}"}