Merge pull request #4 from Vacant2333/main

feat: add kubernetes deployment and get owners by OWNERS file

Author: jwcesign

bots/pr_review_request/bot.py

@@ -7,17 +7,20 @@
 
 class PRReviewRequestBot(bot.GitAutomatorBot):
     def handle_action(self, _: str):
-        maintainers = helper.get_owners(self.repo_client)
-        pr_creator = self.webhook_body['sender']['login']
-        if pr_creator in maintainers:
-            maintainers.remove(pr_creator)
+        try:
+            maintainers = helper.get_owners(self.repo_client)
+            pr_creator = self.webhook_body['sender']['login']
+            if pr_creator in maintainers:
+                maintainers.remove(pr_creator)
 
-        if len(maintainers) == 0:
-            return
-        if len(maintainers) > 2:
-            maintainers = random.sample(maintainers, 2)
-        pull_request = self.repo_client.get_pull(self.webhook_body['pull_request']['number'])
-        pull_request.create_review_request(reviewers=maintainers)
+            if len(maintainers) == 0:
+                return
+            if len(maintainers) > 2:
+                maintainers = random.sample(maintainers, 2)
+            pull_request = self.repo_client.get_pull(self.webhook_body['pull_request']['number'])
+            pull_request.create_review_request(reviewers=maintainers)
+        except Exception as e:
+            print("error:", e)
 
     @property
     def name(self) -> str:

bots/utils/ai_robot.py

@@ -21,7 +21,7 @@ def get_label(self, context: str, label_list: list) -> dict:
                             [{labe_name, label color, label description}, more...]"},
                 {"role": "user", "content": f"context is: \n{context}\n label's list ls:\n{json.dumps(label_list)}"}
             ],
-            model="gpt-4",
+            model="qwen-plus",
         )
         resp = chat_completion.choices[0].message.content
         return json.loads(resp)
@@ -37,7 +37,7 @@ def check_release_note(self, context: str) -> str:
                             either empty or incomplete, please consider: `{content}`', {content} shouldn't contain the markdown things, and it should be wrapped in ``, not ''"},
                 {"role": "user", "content": f"context is: \n{context}"}
             ],
-            model="gpt-4",
+            model="qwen-plus",
         )
         resp = chat_completion.choices[0].message.content
         return resp

bots/utils/helper.py

@@ -1,19 +1,71 @@
 import yaml
-
 from github import Repository
 
-def get_owners(repo_client : Repository.Repository) -> list:
+def get_enable_plugin(repo_client: Repository.Repository) -> list:
     try:
         file = repo_client.get_contents(".github/gitautomator.yaml")
         config = yaml.safe_load(file.decoded_content.decode())
-        return config['owners']
+        return config['plugins']
     except Exception as _:
         return []
 
-def get_enable_plugin(repo_client: Repository.Repository) -> list:
+def expand_aliases(owners_list, aliases_map):
+    """
+    Expands any aliases found in the owners_list using the provided aliases_map.
+    If the item exists in aliases_map and is a list, its users are added;
+    otherwise, the item is added as is.
+    """
+    expanded = set()
+    for item in owners_list:
+        if item in aliases_map and isinstance(aliases_map[item], list):
+            expanded.update(aliases_map[item])
+        else:
+            expanded.add(item)
+    return expanded
+
+def get_owners(repo_client: Repository.Repository) -> list:
+    """
+    Combines owners from three sources:
+      1. .github/gitautomator.yaml (expects an 'owners' key with a list of usernames)
+      2. OWNERS_ALIASES (mapping from an alias to a list of real user names)
+      3. OWNERS (expected to contain 'approvers' and/or 'reviewers' as lists)
+
+    Returns a merged list of owner usernames.
+    """
+    owners_set = set()
+    aliases_map = {}
+
+    # 1. Read .github/gitautomator.yaml for "owners"
     try:
         file = repo_client.get_contents(".github/gitautomator.yaml")
         config = yaml.safe_load(file.decoded_content.decode())
-        return config['plugins']
+        if config and 'owners' in config and isinstance(config['owners'], list):
+            owners_set.update(config['owners'])
     except Exception as _:
-        return []
+        pass
+
+    # 2. Read OWNERS_ALIASES for alias mapping
+    try:
+        file = repo_client.get_contents("OWNERS_ALIASES")
+        alias_data = yaml.safe_load(file.decoded_content.decode())
+        if isinstance(alias_data, dict):
+            if "aliases" in alias_data and isinstance(alias_data["aliases"], dict):
+                aliases_map = alias_data["aliases"]
+            else:
+                aliases_map = alias_data
+    except Exception as _:
+        pass
+
+    # 3. Read OWNERS and expand the "approvers" and "reviewers" fields using aliases_map
+    try:
+        file = repo_client.get_contents("OWNERS")
+        owners_data = yaml.safe_load(file.decoded_content.decode())
+        if isinstance(owners_data, dict):
+            approvers = owners_data.get("approvers", [])
+            reviewers = owners_data.get("reviewers", [])
+            owners_set.update(expand_aliases(approvers, aliases_map))
+            owners_set.update(expand_aliases(reviewers, aliases_map))
+    except Exception as _:
+        pass
+
+    return list(owners_set)

deployment.yaml

@@ -0,0 +1,50 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gitautomator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: gitautomator
+  template:
+    metadata:
+      labels:
+        app: gitautomator
+    spec:
+      containers:
+        - name: gitautomator
+          image: cesign/gitautomator:v0.0.13
+          env:
+            - name: APP_ID
+              value: "${APP_ID}"
+            - name: CHATGPT_URL
+              value: "${CHATGPT_URL}"
+            - name: OPENAI_KEY
+              value: "${OPENAI_KEY}"
+          volumeMounts:
+            - name: gitautomator-pem
+              mountPath: /etc/gitautomator/app.pem
+              subPath: app.pem
+        - name: seemio
+          image: cesign/seemio:v0.0.1
+          env:
+            - name: SEEMIO_URL
+              value: "${SEEMIO_URL}"
+          command:
+            - sh
+            - -c
+            - "smee -u $SEEMIO_URL --port 5000"
+      volumes:
+        - name: gitautomator-pem
+          secret:
+            secretName: gitautomator-pem
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: gitautomator-pem
+type: Opaque
+data:
+  # Replace the value below with your base64-encoded app.pem file content.
+  app.pem: <base64-encoded-app.pem-content>

requirements.txt

@@ -4,3 +4,4 @@ gitpython==3.1.32
 PyGithub==2.2.0
 PyYAML==6.0.1
 Requests==2.31.0
+httpx==0.27.2