Merge pull request #96 from codecov/scott/github-pr-labels

GitHub PR labels, SQLAlchemy version

Author: scott-codecov

setup.py

@@ -47,7 +47,7 @@
         "pyjwt",
         "pytz",
         "django>=4.2.3",
-        "sqlalchemy>=2.0",
+        "sqlalchemy==1.*",
         "ijson==3.*",
     ],
 )

shared/bundle_analysis/models.py

@@ -2,9 +2,9 @@
 from typing import List
 
 from sqlalchemy import Column, ForeignKey, Table, create_engine, types
-from sqlalchemy.orm import Mapped
+from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import Session as DbSession
-from sqlalchemy.orm import backref, declarative_base, relationship, sessionmaker
+from sqlalchemy.orm import backref, relationship, sessionmaker
 
 SCHEMA = """
 create table sessions (
@@ -131,10 +131,8 @@ class Asset(Base):
     normalized_name = Column(types.Text, nullable=False)
     size = Column(types.Integer, nullable=False)
 
-    session = relationship(Session, backref=backref("assets"))
-    chunks: Mapped[List["Chunk"]] = relationship(
-        secondary=assets_chunks, back_populates="assets"
-    )
+    session = relationship("Session", backref=backref("assets"))
+    chunks = relationship("Chunk", secondary=assets_chunks, back_populates="assets")
 
 
 class Chunk(Base):
@@ -150,12 +148,8 @@ class Chunk(Base):
     entry = Column(types.Boolean, nullable=False)
     initial = Column(types.Boolean, nullable=False)
 
-    assets: Mapped[List["Asset"]] = relationship(
-        secondary=assets_chunks, back_populates="chunks"
-    )
-    modules: Mapped[List["Module"]] = relationship(
-        secondary=chunks_modules, back_populates="chunks"
-    )
+    assets = relationship("Asset", secondary=assets_chunks, back_populates="chunks")
+    modules = relationship("Module", secondary=chunks_modules, back_populates="chunks")
 
 
 class Module(Base):
@@ -169,9 +163,7 @@ class Module(Base):
     name = Column(types.Text, nullable=False)
     size = Column(types.Integer, nullable=False)
 
-    chunks: Mapped[List["Chunk"]] = relationship(
-        secondary=chunks_modules, back_populates="modules"
-    )
+    chunks = relationship("Chunk", secondary=chunks_modules, back_populates="modules")
 
 
 class MetadataKey(Enum):

shared/torngit/github.py

@@ -1141,6 +1141,7 @@ def _pull(self, pull):
             title=pull["title"],
             id=str(pull["number"]),
             number=str(pull["number"]),
+            labels=[label["name"] for label in pull.get("labels", [])],
         )
 
     async def get_pull_request(self, pullid, token=None):

shared/validation/user_schema.py

@@ -490,7 +490,11 @@
     },
     "beta_groups": {"type": "list", "schema": {"type": "string"}},
     "ai_pr_review": {
-        "type": ["dict", "boolean"],
-        "schema": {"enabled": {"type": "boolean"}},
+        "type": ["dict"],
+        "schema": {
+            "enabled": {"type": "boolean"},
+            "method": {"type": "string"},
+            "label_name": {"type": "string"},
+        },
     },
 }

tests/integration/test_github.py

@@ -270,6 +270,7 @@ async def test_get_pull_request_fail(
                 "state": "merged",
                 "title": "Creating new code for reasons no one knows",
                 "author": {"id": "44376991", "username": "ThiagoCodecov"},
+                "labels": [],
             },
         )
     ]
@@ -293,6 +294,7 @@ async def test_get_pull_request_way_more_than_250_results(
             "state": "open",
             "title": "PR with more than 250 results",
             "author": {"id": "44376991", "username": "ThiagoCodecov"},
+            "labels": [],
         }
         res = await valid_handler.get_pull_request(pull_id)
         assert res == expected_result
@@ -1182,6 +1184,7 @@ async def test_get_pull_request_base_doesnt_match(self, valid_handler, codecov_v
             "state": "closed",
             "title": "Thiago/test 1",
             "author": {"id": "44376991", "username": "ThiagoCodecov"},
+            "labels": [],
         }
         res = await valid_handler.get_pull_request(pull_id)
         assert res == expected_result
@@ -1210,6 +1213,7 @@ async def test_get_pull_request_base_partially_differs(
             "state": "merged",
             "title": "CE-1314 GitHub Status Event Handler",
             "author": {"id": "5767537", "username": "pierce-m"},
+            "labels": [],
         }
         res = await handler.get_pull_request(pull_id)
         assert res == expected_result