cleanup dendrite multi_forward

opentensor · Jun 8, 2023 · 8fb3aab · 8fb3aab
1 parent 2042122
commit 8fb3aab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 67 deletions.
diff --git a/bittensor/__init__.py b/bittensor/__init__.py
@@ -192,8 +192,6 @@ def turn_console_off():
 
 from bittensor._proto.bittensor_pb2 import ForwardTextPromptingRequest
 from bittensor._proto.bittensor_pb2 import ForwardTextPromptingResponse
-from bittensor._proto.bittensor_pb2 import MultiForwardTextPromptingRequest
-from bittensor._proto.bittensor_pb2 import MultiForwardTextPromptingResponse
 from bittensor._proto.bittensor_pb2 import BackwardTextPromptingRequest
 from bittensor._proto.bittensor_pb2 import BackwardTextPromptingResponse
 
@@ -208,12 +206,6 @@ def turn_console_off():
 from bittensor._dendrite.text_prompting.dendrite import TextPromptingDendrite as text_prompting
 from bittensor._dendrite.text_prompting.dendrite_pool import TextPromptingDendritePool as text_prompting_pool
 
-# ---- Base Miners -----
-from bittensor._neuron.base_miner_neuron import BaseMinerNeuron
-from bittensor._neuron.base_validator import BaseValidator
-from bittensor._neuron.base_prompting_miner import BasePromptingMiner
-from bittensor._neuron.base_huggingface_miner import HuggingFaceMiner
-
 # ---- Errors and Exceptions -----
 from bittensor._keyfile.keyfile_impl import KeyFileError as KeyFileError
 
@@ -322,19 +314,11 @@ def forward(
             return_all: bool = False,
         ) -> Union[str, List[str]]:
         roles, messages = self.format_content( content )
-        if not return_all:
-            return self._dendrite.forward(
-                roles = roles,
-                messages = messages,
-                timeout = timeout
-            ).completion
-        else:
-            return self._dendrite.multi_forward(
-                roles = roles,
-                messages = messages,
-                timeout = timeout
-            ).multi_completions
-
+        return self._dendrite.forward(
+            roles = roles,
+            messages = messages,
+            timeout = timeout
+        ).completion
 
     async def async_forward(
             self,
@@ -343,18 +327,11 @@ async def async_forward(
             return_all: bool = False,
         ) -> Union[str, List[str]]:
         roles, messages = self.format_content( content )
-        if not return_all:
-            return await self._dendrite.async_forward(
-                    roles = roles,
-                    messages = messages,
-                    timeout = timeout
-                ).completion
-        else:
-            return self._dendrite.async_multi_forward(
+        return await self._dendrite.async_forward(
                 roles = roles,
                 messages = messages,
                 timeout = timeout
-            ).multi_completions
+            ).completion
 
 class BittensorLLM(LLM):
     """Wrapper around Bittensor Prompting Subnetwork.

diff --git a/bittensor/_dendrite/text_prompting/dendrite.py b/bittensor/_dendrite/text_prompting/dendrite.py
@@ -14,12 +14,10 @@
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-import grpc
 import json
 import torch
-import asyncio
 import bittensor
-from typing import Callable, List, Dict, Union
+from typing import Callable, List, Union
 
 class DendriteForwardCall( bittensor.DendriteCall ):
 
@@ -198,40 +196,6 @@ async def async_forward(
         if return_call: return forward_call
         else: return forward_call.completion
 
-    def multi_forward(
-            self,
-            roles: List[ str ] ,
-            messages: List[ str ],
-            timeout: float = bittensor.__blocktime__,
-            return_call:bool = True,
-        ) -> Union[ str, DendriteForwardCall ]:
-        forward_call = MultiDendriteForwardCall(
-            dendrite = self,
-            messages = messages,
-            roles = roles,
-            timeout = timeout,
-        )
-        response_call = self.loop.run_until_complete( self.apply( dendrite_call = forward_call ) )
-        if return_call: return response_call
-        else: return response_call.multi_completions
-
-    async def async_multi_forward(
-        self,
-        roles: List[ str ],
-        messages: List[ str ],
-        timeout: float = bittensor.__blocktime__,
-        return_call: bool = True,
-    ) -> Union[ str, DendriteForwardCall ]:
-        forward_call = MultiDendriteForwardCall(
-            dendrite = self,
-            messages = messages,
-            roles = roles,
-            timeout = timeout,
-        )
-        forward_call = await self.apply( dendrite_call = forward_call )
-        if return_call: return forward_call
-        else: return forward_call.multi_completions
-
     def backward(
             self,
             roles: List[ str ],