diff --git a/build/lib/evolutionapi/services/group.py b/build/lib/evolutionapi/services/group.py index 6bfbcfe..3b27006 100644 --- a/build/lib/evolutionapi/services/group.py +++ b/build/lib/evolutionapi/services/group.py @@ -14,39 +14,34 @@ class GroupService: def update_group_picture(self, instance_id: str, group_jid: str, data: GroupPicture, instance_token: str): return self.client.post( - f'group/updateGroupPicture/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateGroupPicture/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def update_group_subject(self, instance_id: str, group_jid: str, data: GroupSubject, instance_token: str): return self.client.post( - f'group/updateGroupSubject/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateGroupSubject/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def update_group_description(self, instance_id: str, group_jid: str, data: GroupDescription, instance_token: str): return self.client.post( - f'group/updateGroupDescription/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateGroupDescription/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def get_invite_code(self, instance_id: str, group_jid: str, instance_token: str): return self.client.get( - f'group/inviteCode/{instance_id}', - params={'groupJid': group_jid}, + f'group/inviteCode/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) def revoke_invite_code(self, instance_id: str, group_jid: str, instance_token: str): return self.client.post( - f'group/revokeInviteCode/{instance_id}', - params={'groupJid': group_jid}, + f'group/revokeInviteCode/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) @@ -59,59 +54,52 @@ class GroupService: def get_invite_info(self, instance_id: str, invite_code: str, instance_token: str): return self.client.get( - f'group/inviteInfo/{instance_id}', - params={'inviteCode': invite_code}, + f'group/inviteInfo/{instance_id}?inviteCode={invite_code}', instance_token=instance_token ) def get_group_info(self, instance_id: str, group_jid: str, instance_token: str): return self.client.get( - f'group/findGroupInfos/{instance_id}', - params={'groupJid': group_jid}, + f'group/findGroupInfos/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) def fetch_all_groups(self, instance_id: str, instance_token: str, get_participants: bool = False): + url = f'group/fetchAllGroups/{instance_id}?getParticipants={str(get_participants).lower()}' return self.client.get( - f'group/fetchAllGroups/{instance_id}', - params={'getParticipants': get_participants}, + url, instance_token=instance_token ) def get_participants(self, instance_id: str, group_jid: str, instance_token: str): return self.client.get( - f'group/participants/{instance_id}', - params={'groupJid': group_jid}, + f'group/participants/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) def update_participant(self, instance_id: str, group_jid: str, data: UpdateParticipant, instance_token: str): return self.client.post( - f'group/updateParticipant/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateParticipant/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def update_setting(self, instance_id: str, group_jid: str, data: UpdateSetting, instance_token: str): return self.client.post( - f'group/updateSetting/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateSetting/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def toggle_ephemeral(self, instance_id: str, group_jid: str, data: ToggleEphemeral, instance_token: str): return self.client.post( - f'group/toggleEphemeral/{instance_id}', - params={'groupJid': group_jid}, + f'group/toggleEphemeral/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def leave_group(self, instance_id: str, group_jid: str, instance_token: str): return self.client.delete( - f'group/leaveGroup/{instance_id}', - params={'groupJid': group_jid}, + f'group/leaveGroup/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) \ No newline at end of file diff --git a/dist/evolutionapi-0.0.7.tar.gz b/dist/evolutionapi-0.0.7.tar.gz deleted file mode 100644 index ef6ff39..0000000 Binary files a/dist/evolutionapi-0.0.7.tar.gz and /dev/null differ diff --git a/dist/evolutionapi-0.0.7-py3-none-any.whl b/dist/evolutionapi-0.0.8-py3-none-any.whl similarity index 85% rename from dist/evolutionapi-0.0.7-py3-none-any.whl rename to dist/evolutionapi-0.0.8-py3-none-any.whl index 390170f..f087113 100644 Binary files a/dist/evolutionapi-0.0.7-py3-none-any.whl and b/dist/evolutionapi-0.0.8-py3-none-any.whl differ diff --git a/dist/evolutionapi-0.0.8.tar.gz b/dist/evolutionapi-0.0.8.tar.gz new file mode 100644 index 0000000..a2fd111 Binary files /dev/null and b/dist/evolutionapi-0.0.8.tar.gz differ diff --git a/evolutionapi.egg-info/PKG-INFO b/evolutionapi.egg-info/PKG-INFO index ab0b0c0..7256c32 100644 --- a/evolutionapi.egg-info/PKG-INFO +++ b/evolutionapi.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: evolutionapi -Version: 0.0.7 +Version: 0.0.8 Summary: Client Python para a API Evolution Author: Davidson Gomes Author-email: contato@agenciadgcode.com diff --git a/evolutionapi/services/__pycache__/chat.cpython-310.pyc b/evolutionapi/services/__pycache__/chat.cpython-310.pyc index c96137d..87c1661 100644 Binary files a/evolutionapi/services/__pycache__/chat.cpython-310.pyc and b/evolutionapi/services/__pycache__/chat.cpython-310.pyc differ diff --git a/evolutionapi/services/__pycache__/group.cpython-310.pyc b/evolutionapi/services/__pycache__/group.cpython-310.pyc index addc901..60b4301 100644 Binary files a/evolutionapi/services/__pycache__/group.cpython-310.pyc and b/evolutionapi/services/__pycache__/group.cpython-310.pyc differ diff --git a/evolutionapi/services/group.py b/evolutionapi/services/group.py index 6bfbcfe..3b27006 100644 --- a/evolutionapi/services/group.py +++ b/evolutionapi/services/group.py @@ -14,39 +14,34 @@ class GroupService: def update_group_picture(self, instance_id: str, group_jid: str, data: GroupPicture, instance_token: str): return self.client.post( - f'group/updateGroupPicture/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateGroupPicture/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def update_group_subject(self, instance_id: str, group_jid: str, data: GroupSubject, instance_token: str): return self.client.post( - f'group/updateGroupSubject/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateGroupSubject/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def update_group_description(self, instance_id: str, group_jid: str, data: GroupDescription, instance_token: str): return self.client.post( - f'group/updateGroupDescription/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateGroupDescription/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def get_invite_code(self, instance_id: str, group_jid: str, instance_token: str): return self.client.get( - f'group/inviteCode/{instance_id}', - params={'groupJid': group_jid}, + f'group/inviteCode/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) def revoke_invite_code(self, instance_id: str, group_jid: str, instance_token: str): return self.client.post( - f'group/revokeInviteCode/{instance_id}', - params={'groupJid': group_jid}, + f'group/revokeInviteCode/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) @@ -59,59 +54,52 @@ class GroupService: def get_invite_info(self, instance_id: str, invite_code: str, instance_token: str): return self.client.get( - f'group/inviteInfo/{instance_id}', - params={'inviteCode': invite_code}, + f'group/inviteInfo/{instance_id}?inviteCode={invite_code}', instance_token=instance_token ) def get_group_info(self, instance_id: str, group_jid: str, instance_token: str): return self.client.get( - f'group/findGroupInfos/{instance_id}', - params={'groupJid': group_jid}, + f'group/findGroupInfos/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) def fetch_all_groups(self, instance_id: str, instance_token: str, get_participants: bool = False): + url = f'group/fetchAllGroups/{instance_id}?getParticipants={str(get_participants).lower()}' return self.client.get( - f'group/fetchAllGroups/{instance_id}', - params={'getParticipants': get_participants}, + url, instance_token=instance_token ) def get_participants(self, instance_id: str, group_jid: str, instance_token: str): return self.client.get( - f'group/participants/{instance_id}', - params={'groupJid': group_jid}, + f'group/participants/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) def update_participant(self, instance_id: str, group_jid: str, data: UpdateParticipant, instance_token: str): return self.client.post( - f'group/updateParticipant/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateParticipant/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def update_setting(self, instance_id: str, group_jid: str, data: UpdateSetting, instance_token: str): return self.client.post( - f'group/updateSetting/{instance_id}', - params={'groupJid': group_jid}, + f'group/updateSetting/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def toggle_ephemeral(self, instance_id: str, group_jid: str, data: ToggleEphemeral, instance_token: str): return self.client.post( - f'group/toggleEphemeral/{instance_id}', - params={'groupJid': group_jid}, + f'group/toggleEphemeral/{instance_id}?groupJid={group_jid}', data=data.__dict__, instance_token=instance_token ) def leave_group(self, instance_id: str, group_jid: str, instance_token: str): return self.client.delete( - f'group/leaveGroup/{instance_id}', - params={'groupJid': group_jid}, + f'group/leaveGroup/{instance_id}?groupJid={group_jid}', instance_token=instance_token ) \ No newline at end of file diff --git a/setup.py b/setup.py index 29b00ca..0598239 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='evolutionapi', - version='0.0.7', + version='0.0.8', description='Client Python para a API Evolution', author='Davidson Gomes', author_email='contato@agenciadgcode.com', diff --git a/test_evolution.py b/test_evolution.py index 61baf36..cb91767 100644 --- a/test_evolution.py +++ b/test_evolution.py @@ -11,8 +11,12 @@ client = EvolutionClient( ) -instance_token = "429683C4C977415CAAFCCE10F7D57E11" -instance_id = "teste" +instance_token = "60BDC703E413-4710-9473-CA2A763866FE" +instance_id = "94a0aafa-e636-4534-a185-5562bf8f2c22" + +response = client.group.fetch_all_groups(instance_id, instance_token, False) + +print(response) # text_message = TextMessage( # number="557499879409", @@ -25,18 +29,18 @@ instance_id = "teste" # print("Mensagem de texto enviada") # print(response) -media_message = MediaMessage( - number="557499879409", - mediatype="document", - mimetype="application/pdf", - caption="Olá, como vai?", - fileName="arquivo.pdf" -) +# media_message = MediaMessage( +# number="557499879409", +# mediatype="document", +# mimetype="application/pdf", +# caption="Olá, como vai?", +# fileName="arquivo.pdf" +# ) -response = client.messages.send_media(instance_id, media_message, instance_token, "arquivo.pdf") +# response = client.messages.send_media(instance_id, media_message, instance_token, "arquivo.pdf") -print("Mensagem de mídia enviada") -print(response) +# print("Mensagem de mídia enviada") +# print(response) # print("Buscando instâncias") # instances = client.instances.fetch_instances()