编程列表返回结果增加URL

app/crud/data_table.py

@@ -138,7 +138,7 @@ def get_ailab_table(db: Session, project_id: int):
             .filter(models.DataTable.source==1)\
             .order_by(models.DataTable.create_time.desc()).all()
         res = [t.table_name for t in data_tables]
-    return res
+    return {"table_list": res, "database_name": database_name}
 
 def get_ailab_table_schema(db: Session, table_name: str):
     table_schema = hiveDs.get_table_schema(table_name)

app/crud/programme.py

@@ -61,12 +61,11 @@ def start_jupyter(db: Session, item: schemas.ProgrammeId):
     if not j_data:
         send_util.stop_jupyter({'namespace': namespace,'release_name': db_item.release_name})
         raise Exception("创建Jupyter失败")
-    url = f"http://{j_data['host']}{j_data['base_url']}/lab"
     db_item.status = 1
     db.commit()
     db.flush()
     db.refresh(db_item)
-    return url
+    return db_item
 
 def stop_jupyter(db: Session, item: schemas.ProgrammeId):
     db_item: models.Programme = db.query(models.Programme).filter(models.Programme.id == item.programme_id).first()
@@ -96,4 +95,9 @@ def update_jupyter_password(db: Session, item: schemas.ProgrammeUpdate):
 
 def get_programme(db: Session):
     db_items: List[models.Programme] = db.query(models.Programme).filter(models.Programme.project_id == g.project_id).all()
-    return db_items
+    res = []
+    for item in db_items:
+        i_dict = item.to_dict()
+        i_dict.update({"complete_url": f"http://{host}{i_dict['base_url']}/lab"})
+        res.append(i_dict)
+    return res