Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Update functional.py" #466

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Revert "Update functional.py" #466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 40 additions & 66 deletions infra/modal/functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,15 @@ def _get_array(self):

@build()
async def download_model(self):
try:
print(f"downloading models {self.model_id} ...")
self._get_array()
except Exception as e:
print(f"Error downloading model: {e}")
print(f"downloading models {self.model_id} ...")
self._get_array()
Comment on lines +31 to +32
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: model download failures will now crash the application instead of being caught and logged


@enter()
async def enter(self):
try:
print("Starting the engine array ...")
self.engine_array = self._get_array()
await self.engine_array.astart()
print("engine array started!")
except Exception as e:
print(f"Error starting the engine array: {e}")
print("Starting the engine array ...")
self.engine_array = self._get_array()
await self.engine_array.astart()
print("engine array started!")
Comment on lines +36 to +39
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: engine array startup failures will now crash the application instead of being caught and logged



@app.cls(gpu="any", allow_concurrent_inputs=500)
Expand All @@ -55,43 +49,27 @@ def __init__(self, model_id: tuple[str]) -> None:

@method()
async def embed(self, sentences: list[str], model: str | int = 0):
try:
engine = self.engine_array[model]
embeddings, usage = await engine.embed(sentences=sentences)
return embeddings
except Exception as e:
print(f"Error embedding sentences: {e}")
return None
engine = self.engine_array[model]
embeddings, usage = await engine.embed(sentences=sentences)
return embeddings

@method()
async def image_embed(self, urls: list[str], model: str | int = 0):
try:
engine = self.engine_array[model]
embeddings, usage = await engine.image_embed(images=urls)
return embeddings
except Exception as e:
print(f"Error embedding images: {e}")
return None
engine = self.engine_array[model]
embeddings, usage = await engine.image_embed(images=urls)
return embeddings

@method()
async def rerank(self, query: str, docs: list[str], model: str | int = 0):
try:
engine = self.engine_array[model]
rankings, usage = await engine.rerank(query=query, docs=docs)
return rankings
except Exception as e:
print(f"Error reranking documents: {e}")
return None
engine = self.engine_array[model]
rankings, usage = await engine.rerank(query=query, docs=docs)
return rankings

@method()
async def classify(self, sentences: list[str], model: str | int = 0):
try:
engine = self.engine_array[model]
classes, usage = await engine.classify(sentences=sentences)
return classes
except Exception as e:
print(f"Error classifying sentences: {e}")
return None
engine = self.engine_array[model]
classes, usage = await engine.classify(sentences=sentences)
return classes


@app.local_entrypoint()
Expand All @@ -103,32 +81,28 @@ def main():
"philschmid/tiny-bert-sst2-distilled",
)
deployment = InfinityModal(model_id=model_id)

try:
embeddings_1 = deployment.embed.remote(sentences=["hello world"], model=model_id[1])
embeddings_2 = deployment.image_embed.remote(
urls=["http://images.cocodataset.org/val2017/000000039769.jpg"],
model=model_id[0],
)
embeddings_1 = deployment.embed.remote(sentences=["hello world"], model=model_id[1])
embeddings_2 = deployment.image_embed.remote(
urls=["http://images.cocodataset.org/val2017/000000039769.jpg"],
model=model_id[0],
)

rerankings_1 = deployment.rerank.remote(
query="Where is Paris?",
docs=["Paris is the capital of France.", "Berlin is a city in Europe."],
model=model_id[2],
)
rerankings_1 = deployment.rerank.remote(
query="Where is Paris?",
docs=["Paris is the capital of France.", "Berlin is a city in Europe."],
model=model_id[2],
)

classifications_1 = deployment.classify.remote(
sentences=["I feel great today!"], model=model_id[3]
)
classifications_1 = deployment.classify.remote(
sentences=["I feel great today!"], model=model_id[3]
)

print(
"Success, all tasks submitted! Embeddings:",
embeddings_1[0].shape if embeddings_1 else "N/A",
embeddings_2[0].shape if embeddings_2 else "N/A",
"Rerankings:",
rerankings_1 if rerankings_1 else "N/A",
"Classifications:",
classifications_1 if classifications_1 else "N/A",
)
except Exception as e:
print(f"Error in main entrypoint: {e}")
print(
"Success, all tasks submitted! Embeddings:",
embeddings_1[0].shape,
embeddings_2[0].shape,
"Rerankings:",
rerankings_1,
"Classifications:",
classifications_1,
Comment on lines +101 to +107
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: accessing shape of potentially failed operations may cause NullPointerException

)
Loading