Merge pull request #2603 from hlohaus/25Jan

Add MiniMax providers, add HailuoAI provider

README.md

@@ -99,22 +99,24 @@ Is your site on this repository and you want to take it down? Send an email to t
 ### 🐳 Using Docker
 1. **Install Docker:** [Download and install Docker](https://docs.docker.com/get-docker/).
 2. **Set Up Directories:** Before running the container, make sure the necessary data directories exist or can be created. For example, you can create and set ownership on these directories by running:
-   ```bash
+```bash
    mkdir -p ${PWD}/har_and_cookies ${PWD}/generated_images
-   chown -R 1000:1000 ${PWD}/har_and_cookies ${PWD}/generated_images
-   ```
+   sudo chown -R 1200:1201 ${PWD}/har_and_cookies ${PWD}/generated_images
+```
 3. **Run the Docker Container:** Use the following commands to pull the latest image and start the container:
-   ```bash
+```bash
    docker pull hlohaus789/g4f
-   docker run -p 8080:8080 -p 1337:1337 -p 7900:7900 \
+   docker run -p 8080:8080 -p 7900:7900 \
      --shm-size="2g" \
      -v ${PWD}/har_and_cookies:/app/har_and_cookies \
      -v ${PWD}/generated_images:/app/generated_images \
      hlohaus789/g4f:latest
-   ```
+```
 
-4. **Running the Slim Docker Image:** Use the following command to run the Slim Docker image. This command also updates the `g4f` package at startup and installs any additional dependencies:
-	```bash
+4. **Running the Slim Docker Image:** And use the following commands to run the Slim Docker image. This command also updates the `g4f` package at startup and installs any additional dependencies:
+```bash
+  mkdir -p ${PWD}/har_and_cookies ${PWD}/generated_images
+  chown -R 1000:1000 ${PWD}/har_and_cookies ${PWD}/generated_images
 	docker run \
 	  -p 1337:1337 \
 	  -v ${PWD}/har_and_cookies:/app/har_and_cookies \
@@ -126,8 +128,8 @@ Is your site on this repository and you want to take it down? Send an email to t
 	```
 
 5. **Access the Client Interface:**
-   - **To use the included client, navigate to:** [http://localhost:8080/chat/](http://localhost:8080/chat/) or [http://localhost:1337/chat/](http://localhost:1337/chat/)
-   - **Or set the API base for your client to:** [http://localhost:1337/v1](http://localhost:1337/v1)
+   - **To use the included client, navigate to:** [http://localhost:8080/chat/](http://localhost:8080/chat/)
+   - **Or set the API base for your client to:** [http://localhost:8080/v1](http://localhost:8080/v1)
 
 6. **(Optional) Provider Login:**
    If required, you can access the container's desktop here: http://localhost:7900/?autoconnect=1&resize=scale&password=secret for provider login purposes.

docker-compose-slim.yml

@@ -1,25 +1,14 @@
 version: '3'
 
 services:
-  g4f-gui:
-    container_name: g4f-gui
+  g4f-slim:
+    container_name: g4f-slim
     image: hlohaus789/g4f:latest-slim
     build:
       context: .
       dockerfile: docker/Dockerfile-slim
-    command: python -m g4f.cli gui -debug
+    command: python -m g4f --debug --port 8080
     volumes:
       - .:/app
     ports:
-      - '8080:8080'
-  g4f-api:
-    container_name: g4f-api
-    image: hlohaus789/g4f:latest-slim
-    build:
-      context: .
-      dockerfile: docker/Dockerfile-slim
-    command: python -m g4f.cli api
-    volumes:
-      - .:/app
-    ports:
-      - '1337:1337'
+      - '8080:8080'

docker-compose.yml

@@ -11,7 +11,6 @@ services:
       - .:/app
     ports:
       - '8080:8080'
-      - '1337:1337'
       - '7900:7900'
     environment:
       - OLLAMA_HOST=host.docker.internal

docker/Dockerfile

@@ -1,26 +1,11 @@
-FROM seleniarm/node-chromium
+FROM selenium/node-chrome
 
 ARG G4F_VERSION
-ARG G4F_USER=g4f
-ARG G4F_USER_ID=1000
-ARG G4F_NO_GUI
-ARG G4F_PASS=secret
-
 ENV G4F_VERSION $G4F_VERSION
-ENV G4F_USER $G4F_USER
-ENV G4F_USER_ID $G4F_USER_ID
-ENV G4F_NO_GUI $G4F_NO_GUI
 
 ENV SE_SCREEN_WIDTH 1850
-ENV PYTHONUNBUFFERED 1
 ENV G4F_DIR /app
-ENV G4F_LOGIN_URL http://localhost:7900/?autoconnect=1&resize=scale&password=$G4F_PASS
-ENV HOME /home/$G4F_USER
-ENV PATH $PATH:$HOME/.local/bin
-ENV SE_DOWNLOAD_DIR $HOME/Downloads
-ENV SEL_USER $G4F_USER
-ENV SEL_UID $G4F_USER_ID
-ENV SEL_GID $G4F_USER_ID
+ENV G4F_LOGIN_URL http://localhost:7900/?autoconnect=1&resize=scale&password=secret
 
 USER root
 
@@ -43,30 +28,15 @@ RUN apt-get -qqy update \
 # Update entrypoint
 COPY docker/supervisor.conf /etc/supervisor/conf.d/selenium.conf
 COPY docker/supervisor-api.conf /etc/supervisor/conf.d/api.conf
-COPY docker/supervisor-gui.conf /etc/supervisor/conf.d/gui.conf
-
-# If no gui
-RUN if [ "$G4F_NO_GUI" ] ; then \
-  rm /etc/supervisor/conf.d/gui.conf \
-  ; fi
 
 # Change background image
 COPY docker/background.png /usr/share/images/fluxbox/ubuntu-light.png
 
 # Add user, fix permissions
-RUN groupadd -g $G4F_USER_ID $G4F_USER \
-  && useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER \
-  && echo "${G4F_USER}:${G4F_PASS}" | chpasswd \
-  && mkdir "${SE_DOWNLOAD_DIR}" \
-  && chown "${G4F_USER_ID}:${G4F_USER_ID}" $SE_DOWNLOAD_DIR /var/run/supervisor /var/log/supervisor \
-  && chown "${G4F_USER_ID}:${G4F_USER_ID}" -R /opt/bin/ /usr/bin/chromedriver /opt/selenium/
+RUN chown "${SEL_UID}:${SEL_GID}" $HOME/.local
 
 # Switch user
-USER $G4F_USER_ID
-
-# Set VNC password
-RUN mkdir -p ${HOME}/.vnc \
-  && x11vnc -storepasswd ${G4F_PASS} ${HOME}/.vnc/passwd
+USER $SEL_UID
 
 # Set the working directory in the container.
 WORKDIR $G4F_DIR
@@ -76,14 +46,10 @@ COPY requirements.txt $G4F_DIR
 
 # Upgrade pip for the latest features and install the project's Python dependencies.
 RUN pip install --break-system-packages --upgrade pip \
-  && pip install --break-system-packages -r requirements.txt \
-  && pip install --break-system-packages \
-    undetected-chromedriver selenium-wire \
-  && pip uninstall -y --break-system-packages \
-    pywebview
+  && pip install --break-system-packages -r requirements.txt
 
 # Copy the entire package into the container.
-ADD --chown=$G4F_USER:$G4F_USER g4f $G4F_DIR/g4f
+ADD --chown=$SEL_UID:$SEL_GID g4f $G4F_DIR/g4f
 
 # Expose ports
-EXPOSE 8080 1337 7900
+EXPOSE 8080 7900

docker/supervisor-api.conf

@@ -1,6 +1,6 @@
 [program:g4f-api]
 priority=15
-command=python -m g4f.cli api
+command=python -m g4f --port 8080 --debug
 directory=/app
 stopasgroup=true
 autostart=true

etc/unittest/main.py

@@ -7,8 +7,7 @@
 
 class TestGetLastProvider(unittest.TestCase):
     def test_get_latest_version(self):
-        try:
+        current_version = g4f.version.utils.current_version
+        if current_version is not None:
             self.assertIsInstance(g4f.version.utils.current_version, str)
-        except VersionNotFoundError:
-            pass
         self.assertIsInstance(g4f.version.utils.latest_version, str)

g4f/Provider/Copilot.py

@@ -207,30 +207,33 @@ def create_completion(
 
 async def get_access_token_and_cookies(url: str, proxy: str = None, target: str = "ChatAI",):
     browser = await get_nodriver(proxy=proxy, user_data_dir="copilot")
-    page = await browser.get(url)
-    access_token = None
-    while access_token is None:
-        access_token = await page.evaluate("""
-            (() => {
-                for (var i = 0; i < localStorage.length; i++) {
-                    try {
-                        item = JSON.parse(localStorage.getItem(localStorage.key(i)));
-                        if (item.credentialType == "AccessToken" 
-                            && item.expiresOn > Math.floor(Date.now() / 1000)
-                            && item.target.includes("target")) {
-                            return item.secret;
-                        }
-                    } catch(e) {}
-                }
-            })()
-        """.replace('"target"', json.dumps(target)))
-        if access_token is None:
-            await asyncio.sleep(1)
-    cookies = {}
-    for c in await page.send(nodriver.cdp.network.get_cookies([url])):
-        cookies[c.name] = c.value
-    await page.close()
-    return access_token, cookies
+    try:
+        page = await browser.get(url)
+        access_token = None
+        while access_token is None:
+            access_token = await page.evaluate("""
+                (() => {
+                    for (var i = 0; i < localStorage.length; i++) {
+                        try {
+                            item = JSON.parse(localStorage.getItem(localStorage.key(i)));
+                            if (item.credentialType == "AccessToken" 
+                                && item.expiresOn > Math.floor(Date.now() / 1000)
+                                && item.target.includes("target")) {
+                                return item.secret;
+                            }
+                        } catch(e) {}
+                    }
+                })()
+            """.replace('"target"', json.dumps(target)))
+            if access_token is None:
+                await asyncio.sleep(1)
+        cookies = {}
+        for c in await page.send(nodriver.cdp.network.get_cookies([url])):
+            cookies[c.name] = c.value
+        await page.close()
+        return access_token, cookies
+    finally:
+        browser.stop()
 
 def readHAR(url: str):
     api_key = None

g4f/Provider/DeepInfraChat.py

@@ -1,19 +1,12 @@
 from __future__ import annotations
 
 from ..typing import AsyncResult, Messages
-from .needs_auth import OpenaiAPI
+from .needs_auth.OpenaiTemplate import OpenaiTemplate
 
-class DeepInfraChat(OpenaiAPI):
-    label = __name__
+class DeepInfraChat(OpenaiTemplate):
     url = "https://deepinfra.com/chat"
-    login_url = None
-    needs_auth = False
     api_base = "https://api.deepinfra.com/v1/openai"
-
     working = True
-    supports_stream = True
-    supports_system_message = True
-    supports_message_history = True
 
     default_model = 'meta-llama/Llama-3.3-70B-Instruct-Turbo'
     models = [

g4f/Provider/Jmuz.py

@@ -1,18 +1,13 @@
 from __future__ import annotations
 
 from ..typing import AsyncResult, Messages
-from .needs_auth.OpenaiAPI import OpenaiAPI
+from .needs_auth.OpenaiTemplate import OpenaiTemplate
 
-class Jmuz(OpenaiAPI):
-    label = "Jmuz"
+class Jmuz(OpenaiTemplate):
     url = "https://discord.gg/Ew6JzjA2NR"
-    login_url = None
     api_base = "https://jmuz.me/gpt/api/v2"
     api_key = "prod"
-
     working = True
-    needs_auth = False
-    supports_stream = True
     supports_system_message = False
 
     default_model = "gpt-4o"

g4f/Provider/Mhystical.py

@@ -1,31 +1,18 @@
 from __future__ import annotations
 
 from ..typing import AsyncResult, Messages
-from .needs_auth.OpenaiAPI import OpenaiAPI
+from .needs_auth.OpenaiTemplate import OpenaiTemplate
 
-"""
-    Mhystical.cc
-    ~~~~~~~~~~~~
-    Author: NoelP.dev
-    Last Updated: 2024-05-11
-    
-    Author Site: https://noelp.dev
-    Provider Site: https://mhystical.cc
-
-"""
-
-class Mhystical(OpenaiAPI):
-    label = "Mhystical"
+class Mhystical(OpenaiTemplate):
     url = "https://mhystical.cc"
     api_endpoint = "https://api.mhystical.cc/v1/completions"
     login_url = "https://mhystical.cc/dashboard"
     api_key = "mhystical"
-    
+
     working = True
-    needs_auth = False
     supports_stream = False  # Set to False, as streaming is not specified in ChatifyAI
     supports_system_message = False
-    
+
     default_model = 'gpt-4'
     models = [default_model]
 

g4f/Provider/You.py

@@ -76,12 +76,15 @@ async def create_async_generator(
                 cookies = get_cookies(".you.com")
             except MissingRequirementsError:
                 browser = await get_nodriver(proxy=proxy)
-                page = await browser.get(cls.url)
-                await page.wait_for('[data-testid="user-profile-button"]', timeout=900)
-                cookies = {}
-                for c in await page.send(nodriver.cdp.network.get_cookies([cls.url])):
-                    cookies[c.name] = c.value
-                await page.close()
+                try:
+                    page = await browser.get(cls.url)
+                    await page.wait_for('[data-testid="user-profile-button"]', timeout=900)
+                    cookies = {}
+                    for c in await page.send(nodriver.cdp.network.get_cookies([cls.url])):
+                        cookies[c.name] = c.value
+                    await page.close()
+                finally:
+                    browser.stop()
         async with StreamSession(
             proxy=proxy,
             impersonate="chrome",

g4f/Provider/__init__.py

@@ -6,11 +6,11 @@
 from ..providers.create_images  import CreateImagesProvider
 
 from .deprecated       import *
-from .selenium         import *
 from .needs_auth       import *
 from .not_working      import *
 from .local            import *
 from .hf_space         import HuggingSpace
+from .mini_max         import HailuoAI, MiniMax
 
 from .AIChatFree           import AIChatFree
 from .AIUncensored         import AIUncensored