Resolve conflicts

.github/CODEOWNERS

@@ -0,0 +1,18 @@
+# This is a comment. Each line is a file pattern followed by one or more owners.
+# For more details, visit https://help.github.com/articles/about-codeowners/
+#
+# Note that the current version of github.com (community edition) does not
+# translate "@org/team-name" correctly, although the GitHub webpage depicts how
+# to use "@org/team-name" as well as "@username" format. So, We need to append
+# all member IDs directly to avoid unexpected situations.
+
+# In order that all members of a repository are supposed to review each other
+* @moyix @thakkarparth007 @fdegier
+converter                    @moyix
+copilot_proxy                @moyix @thakkarparth007
+python_backend               @moyix @thakkarparth007
+tests                        @moyix
+documentation                @moyix @thakkarparth007 @fdegier
+docker-compose.yaml          @moyix @thakkarparth007 @fdegier
+Dockerfile                   @moyix @thakkarparth007 @fdegier 
+copilot_proxy/Dockerfile     @moyix @thakkarparth007 @fdegier 

api.dockerignore

@@ -6,3 +6,4 @@
 models
 converter
 tests
+.pytest_cache

copilot_proxy/app.py

@@ -34,7 +34,18 @@ async def fauxpilot_handler(request: Request, exc: FauxPilotException):
         content=exc.json()
     )
 
+# Used to support copilot.vim 
+@app.get("/copilot_internal/v2/token")
+def get_copilot_token():
+    content = {'token': '1', 'expires_at': 2600000000, 'refresh_in': 900}
+    return JSONResponse(
+        status_code=200,
+        content=content
+    )
+
 @app.post("/v1/engines/codegen/completions")
+# Used to support copilot.vim 
+@app.post("/v1/engines/copilot-codex/completions")
 @app.post("/v1/completions")
 async def completions(data: OpenAIinput):
     data = data.dict()

docker-compose.yaml

@@ -28,6 +28,7 @@ services:
     build:
       context: .
       dockerfile: proxy.Dockerfile
+    command: uvicorn app:app --host 0.0.0.0 --port 5000
     env_file:
       # Automatically created via ./setup.sh
       - .env

tests/python_backend/docker-compose-with-gpus.yaml

@@ -3,7 +3,7 @@ services:
   triton:
     build:
       context: ../../
-      dockerfile: ../../triton.Dockerfile
+      dockerfile: triton.Dockerfile
     command: bash -c "CUDA_VISIBLE_DEVICES="${GPUS}" mpirun -n 1 --allow-run-as-root /opt/tritonserver/bin/tritonserver --model-repository=/model"
     shm_size: '2gb'
     volumes:
@@ -27,7 +27,7 @@ services:
     # For local build
     build:
       context: ../../
-      dockerfile: ../../proxy.Dockerfile
+      dockerfile: proxy.Dockerfile
     env_file:
       # Automatically created via ./setup.sh
       - test.env

tests/python_backend/docker-compose-without-gpus.yaml

@@ -3,7 +3,7 @@ services:
   triton:
     build:
       context: ../../
-      dockerfile: ../../triton.Dockerfile
+      dockerfile: triton.Dockerfile
     command: bash -c "CUDA_VISIBLE_DEVICES="${GPUS}" mpirun -n 1 --allow-run-as-root /opt/tritonserver/bin/tritonserver --model-repository=/model"
     shm_size: '2gb'
     volumes:
@@ -20,7 +20,7 @@ services:
     # For local build
     build:
       context: ../../
-      dockerfile: ../../proxy.Dockerfile
+      dockerfile: proxy.Dockerfile
     env_file:
       # Automatically created via ./setup.sh
       - test.env

triton.dockerignore

@@ -6,3 +6,4 @@
 models
 converter
 tests
+.pytest_cache