Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
kqlio67 committed Nov 13, 2024
2 parents 795e42a + 0d8e4ff commit 37a8e8d
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ To utilize the OpenaiChat provider, a .har file is required from https://chatgpt

##### Storing the .HAR File

- Place the exported .har file in the `./har_and_cookies` directory if you are using Docker. Alternatively, you can store it in any preferred location within your current working directory.
- Place the exported .har file in the `./har_and_cookies` directory if you are using Docker. Alternatively, if you are using Python from a terminal, you can store it in a `./har_and_cookies` directory within your current working directory.

> **Note:** Ensure that your .har file is stored securely, as it may contain sensitive information.
Expand Down
6 changes: 5 additions & 1 deletion docs/interference-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ python -m g4f.api.run
```

**Once running, the API will be accessible at:** `http://localhost:1337/v1`


**(Advanced) Bind to custom port:**
```bash
python -m g4f.cli api --bind "0.0.0.0:2400"
```

## Using the Interference API

Expand Down
88 changes: 88 additions & 0 deletions g4f/Provider/Mhystical.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
from __future__ import annotations

import json
import logging
from aiohttp import ClientSession
from ..typing import AsyncResult, Messages
from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
from .helper import format_prompt

"""
Mhystical.cc
~~~~~~~~~~~~
Author: NoelP.dev
Last Updated: 2024-05-11
Author Site: https://noelp.dev
Provider Site: https://mhystical.cc
"""

class Mhystical(AsyncGeneratorProvider, ProviderModelMixin):
url = "https://api.mhystical.cc"
api_endpoint = "https://api.mhystical.cc/v1/completions"
working = True
supports_stream = False # Set to False, as streaming is not specified in ChatifyAI
supports_system_message = False
supports_message_history = True

default_model = 'gpt-4'
models = [default_model]
model_aliases = {}

@classmethod
def get_model(cls, model: str) -> str:
if model in cls.models:
return model
elif model in cls.model_aliases:
return cls.model_aliases.get(model, cls.default_model)
else:
return cls.default_model

@classmethod
async def create_async_generator(
cls,
model: str,
messages: Messages,
proxy: str = None,
**kwargs
) -> AsyncResult:
model = cls.get_model(model)

headers = {
"x-api-key": "mhystical",
"Content-Type": "application/json",
"accept": "*/*",
"cache-control": "no-cache",
"origin": cls.url,
"referer": f"{cls.url}/",
"user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36"
}

async with ClientSession(headers=headers) as session:
data = {
"model": model,
"messages": [{"role": "user", "content": format_prompt(messages)}]
}
async with session.post(cls.api_endpoint, json=data, headers=headers, proxy=proxy) as response:
if response.status == 400:
yield "Error: API key is missing"
elif response.status == 429:
yield "Error: Rate limit exceeded"
elif response.status == 500:
yield "Error: Internal server error"
else:
response.raise_for_status()
response_text = await response.text()
filtered_response = cls.filter_response(response_text)
yield filtered_response

@staticmethod
def filter_response(response_text: str) -> str:
try:
json_response = json.loads(response_text)
message_content = json_response["choices"][0]["message"]["content"]
return message_content
except (KeyError, IndexError, json.JSONDecodeError) as e:
logging.error("Error parsing response: %s", e)
return "Error: Failed to parse response from API."
1 change: 1 addition & 0 deletions g4f/Provider/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from .TeachAnything import TeachAnything
from .Upstage import Upstage
from .You import You
from .Mhystical import Mhystical

import sys

Expand Down

0 comments on commit 37a8e8d

Please sign in to comment.