From ab433579b33d3b97fbe0de7343a71bad8b0689ae Mon Sep 17 00:00:00 2001 From: svetaStrech Date: Mon, 25 Jul 2022 09:21:06 +0300 Subject: [PATCH 01/16] licecnse comment --- memphis/__init__.py | 13 +++++++++++++ memphis/http_request.py | 25 +++++++++++++++++++------ memphis/memphis.py | 13 +++++++++++++ memphis/retention_types.py | 13 +++++++++++++ memphis/storage_types.py | 13 +++++++++++++ 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/memphis/__init__.py b/memphis/__init__.py index 6265c77..6193199 100644 --- a/memphis/__init__.py +++ b/memphis/__init__.py @@ -1,3 +1,16 @@ +# Copyright 2021-2022 The Memphis Authors +# Licensed under the Apache License, Version 2.0 (the “License”); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an “AS IS” BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License + from memphis.memphis import Memphis import memphis.retention_types import memphis.storage_types diff --git a/memphis/http_request.py b/memphis/http_request.py index f589d27..851409a 100644 --- a/memphis/http_request.py +++ b/memphis/http_request.py @@ -1,3 +1,16 @@ +# Copyright 2021-2022 The Memphis Authors +# Licensed under the Apache License, Version 2.0 (the “License”); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an “AS IS” BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License + import requests import json @@ -13,13 +26,13 @@ def http_request(method, url, headers={}, body_params={}, query_params={}, file= try: typeOfMethod = { "GET": requests.get(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)), - "POST":requests.post(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)), + data=json.dumps(body_params), params=json.dumps(query_params)), + "POST": requests.post(url, headers=headers, timeout=timeout, + data=json.dumps(body_params), params=json.dumps(query_params)), 'PUT': requests.put(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)), - 'DELETE':requests.delete(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)) + data=json.dumps(body_params), params=json.dumps(query_params)), + 'DELETE': requests.delete(url, headers=headers, timeout=timeout, + data=json.dumps(body_params), params=json.dumps(query_params)) } response = typeOfMethod.get(method) if response.status_code != 200: diff --git a/memphis/memphis.py b/memphis/memphis.py index c85ac4a..94e3c32 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -1,3 +1,16 @@ +# Copyright 2021-2022 The Memphis Authors +# Licensed under the Apache License, Version 2.0 (the “License”); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an “AS IS” BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License + import socket import json import nats as broker diff --git a/memphis/retention_types.py b/memphis/retention_types.py index bd6db7d..82e8bd3 100644 --- a/memphis/retention_types.py +++ b/memphis/retention_types.py @@ -1,3 +1,16 @@ +# Copyright 2021-2022 The Memphis Authors +# Licensed under the Apache License, Version 2.0 (the “License”); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an “AS IS” BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License + MAX_MESSAGE_AGE_SECONDS = "message_age_sec" MESSAGES = "messages" BYTES = "bytes" diff --git a/memphis/storage_types.py b/memphis/storage_types.py index cadda62..ecb985e 100644 --- a/memphis/storage_types.py +++ b/memphis/storage_types.py @@ -1,2 +1,15 @@ +# Copyright 2021-2022 The Memphis Authors +# Licensed under the Apache License, Version 2.0 (the “License”); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an “AS IS” BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License + FILE = "file" MEMORY = "memory" From 933ac65fd5bddcff5c9bd6fa069a778304c95a77 Mon Sep 17 00:00:00 2001 From: Sveta Gimpelson <74717402+SvetaMemphis@users.noreply.github.com> Date: Tue, 16 Aug 2022 13:01:52 +0300 Subject: [PATCH 02/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eac6a69..0af1b90 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Utilizing NATS core. ## Installation ```sh -$ pip install memphis +$ pip3 install memphis-py ``` ## Importing From 5be0c0e86e22ca068116c02315bdac837b3ebb4f Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Sat, 20 Aug 2022 22:09:03 +0300 Subject: [PATCH 03/16] implement connect in sdk --- examples/full_example.py | 24 +++++++++++++ examples/producer.py | 22 ------------ memphis/memphis.py | 73 ++++++++++++++-------------------------- memphis/producer.py | 24 +++++++++++++ setup.py | 2 +- 5 files changed, 75 insertions(+), 70 deletions(-) create mode 100644 examples/full_example.py delete mode 100644 examples/producer.py create mode 100644 memphis/producer.py diff --git a/examples/full_example.py b/examples/full_example.py new file mode 100644 index 0000000..009c4de --- /dev/null +++ b/examples/full_example.py @@ -0,0 +1,24 @@ +import asyncio + +from memphis.memphis import Memphis +# from memphis import Memphis + + +async def main(): + try: + memphis = Memphis() + await memphis.connect(host="localhost", username="root", connection_token="memphis") + + # producer = memphis.producer( + # station_name="", producer_name="") + # for i in range(100): + # await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) + + except Exception as e: + print(e) + + finally: + await memphis.close() + +if __name__ == '__main__': + asyncio.run(main()) diff --git a/examples/producer.py b/examples/producer.py deleted file mode 100644 index 042e20d..0000000 --- a/examples/producer.py +++ /dev/null @@ -1,22 +0,0 @@ -import asyncio -from memphis import Memphis - - -async def main(): - try: - memphis = Memphis() - await memphis.connect(host="", username="", connection_token="") - - producer = memphis.producer( - station_name="", producer_name="") - for i in range(100): - await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) - - except Exception as e: - print(e) - - finally: - await memphis.close() - -if __name__ == '__main__': - asyncio.run(main()) diff --git a/memphis/memphis.py b/memphis/memphis.py index 94e3c32..03975af 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -13,15 +13,23 @@ import socket import json +import time + +# import nats as broker + +import sys +sys.path.insert(0, "../memphis-nats.py/") import nats as broker from nats.errors import TimeoutError + import uuid -from memphis.http_request import http_request -from threading import Timer +from http_request import http_request +from threading import Thread, Timer import asyncio +# from memphis.http_request import http_request -import memphis.retention_types -import memphis.storage_types +import retention_types +import storage_types class set_interval(): @@ -44,7 +52,7 @@ def __init__(self): self.connected = False self.is_connection_active = False - async def connect(self, host, username, connection_token, management_port=5555, tcp_port=6666, data_port=7766, reconnect=True, max_reconnect=10, reconnect_interval_ms=1500, timeout_ms=15000): + async def connect(self, host, username, connection_token, management_port=5555, tcp_port=6666, reconnect=True, max_reconnect=10, reconnect_interval_ms=1500, timeout_ms=15000): """Creates connection with Memphis. Args: host (str): memphis host. @@ -52,7 +60,6 @@ async def connect(self, host, username, connection_token, management_port=5555, connection_token (str): broker token. management_port (int, optional): management port. Defaults to 5555. tcp_port (int, optional): tcp port. Defaults to 6666. - data_port (int, optional): data port. Defaults to 7766. reconnect (bool, optional): whether to do reconnect while connection is lost. Defaults to True. max_reconnect (int, optional): The reconnect attempt. Defaults to 3. reconnect_interval_ms (int, optional): Interval in miliseconds between reconnect attempts. Defaults to 200. @@ -63,52 +70,24 @@ async def connect(self, host, username, connection_token, management_port=5555, self.connection_token = connection_token self.management_port = management_port self.tcp_port = tcp_port - self.data_port = data_port self.reconnect = reconnect self.max_reconnect = 9 if max_reconnect > 9 else max_reconnect self.reconnect_interval_ms = reconnect_interval_ms self.timeout_ms = timeout_ms try: - self.client.connect((self.host, self.tcp_port)) - except OSError as msg: - self.client = None - self.__close() - raise Exception(msg) - - connection_details = {"username": self.username, - "broker_creds": self.connection_token, "connection_id": None} - self.client.send(json.dumps(connection_details).encode()) - data = self.client.recv(1024) - try: - data = json.loads(data) + self.broker_manager = await broker.connect(servers=self.host+":"+str(self.tcp_port), + allow_reconnect=self.reconnect, + reconnect_time_wait=self.reconnect_interval_ms/1000, + connect_timeout=self.timeout_ms/1000, + max_reconnect_attempts=self.max_reconnect, user=self.username, + token=self.connection_token) + + self.broker_connection = self.broker_manager.jetstream() + timeout = 3 + self.broker_manager.getConnectionId(timeout) except Exception as e: - raise Exception(data) - self.connection_id = data['connection_id'] - self.access_token_exp = data['access_token_exp'] - - self.is_connection_active = True - self.reconnect_attempts = 0 - - if data['access_token']: - self.access_token = data['access_token'] - self.t_keep_acess_token_fresh = set_interval( - self.__keep_acess_token_fresh, self.access_token_exp/1000) - - if data['ping_interval_ms']: - self.ping_interval_ms = data['ping_interval_ms'] - self.t_ping_server = set_interval( - self.__ping_server, self.ping_interval_ms/1000) - - if not self.connected: - try: - self.broker_manager = await broker.connect(servers=self.host+":"+str(self.data_port), allow_reconnect=self.reconnect, reconnect_time_wait=self.reconnect_interval_ms/1000, connect_timeout=self.timeout_ms/1000, max_reconnect_attempts=self.max_reconnect, token=self.connection_token) - self.broker_connection = self.broker_manager.jetstream() - self.connected = True - except Exception as e: - raise Exception(e) + raise Exception(e) - self.t_timeout = set_interval( - self.__handel_reconnect_timeout, self.timeout_ms/1000) def __handel_reconnect_timeout(self): if(not self.reconnect or self.reconnect_attempts == self.max_reconnect or not self.is_connection_active): @@ -138,7 +117,7 @@ def factory(self, name, description=""): else: raise Exception(e) - def station(self, name, factory_name, retention_type=memphis.retention_types.MAX_MESSAGE_AGE_SECONDS, retention_value=604800, storage_type=memphis.storage_types.FILE, replicas=1, dedup_enabled=False, dedup_window_ms=0): + def station(self, name, factory_name, retention_type=retention_types.MAX_MESSAGE_AGE_SECONDS, retention_value=604800, storage_type=storage_types.FILE, replicas=1, dedup_enabled=False, dedup_window_ms=0): """Creates a station. Args: name (str): station name. @@ -223,7 +202,7 @@ async def __close(self): while self.reconnect_attempts < self.max_reconnect: self.reconnect_attempts += 1 try: - await self.connect(host=self.host, management_port=self.management_port, tcp_port=self.tcp_port, data_port=self.data_port, username=self.username, connection_token=self.connection_token, reconnect=self.reconnect, max_reconnect=self.max_reconnect, reconnect_interval_ms=self.reconnect_interval_ms, timeout_ms=self.timeout_ms) + await self.connect(host=self.host, management_port=self.management_port, tcp_port=self.tcp_port, username=self.username, connection_token=self.connection_token, reconnect=self.reconnect, max_reconnect=self.max_reconnect, reconnect_interval_ms=self.reconnect_interval_ms, timeout_ms=self.timeout_ms) print("Reconnect to memphis has been succeeded") return except Exception as e: diff --git a/memphis/producer.py b/memphis/producer.py new file mode 100644 index 0000000..2705448 --- /dev/null +++ b/memphis/producer.py @@ -0,0 +1,24 @@ +import asyncio + +from memphis import Memphis + + +async def main(): + try: + memphis = Memphis() + await memphis.connect(host="localhost", username="root", connection_token="memphis") + + # producer = memphis.producer( + # station_name="sname", producer_name="pname") + # for i in range(100): + # await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) + + except Exception as e: + print("error" ,e) + + finally: + await memphis.close() + + +if __name__ == '__main__': + asyncio.run(main()) diff --git a/setup.py b/setup.py index bd85f84..26345b1 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ download_url='https://github.com/memphisdev/memphis.py/archive/refs/tags/v0.1.7.tar.gz', keywords=['message broker', 'devtool', 'streaming', 'data'], install_requires=[ - 'nats-py', 'asyncio', 'requests' ], @@ -30,3 +29,4 @@ 'Programming Language :: Python :: 3.12', ], ) + # 'nats-py', From 75d987365ba06e8262d90bacc92957edfe15bce2 Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Sun, 21 Aug 2022 00:03:33 +0300 Subject: [PATCH 04/16] add todo --- memphis/producer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/memphis/producer.py b/memphis/producer.py index 2705448..b936566 100644 --- a/memphis/producer.py +++ b/memphis/producer.py @@ -2,7 +2,7 @@ from memphis import Memphis - +#TODO need to move this example to examples directory - need to fix the problems with imports async def main(): try: memphis = Memphis() @@ -16,8 +16,8 @@ async def main(): except Exception as e: print("error" ,e) - finally: - await memphis.close() + # finally: + # await memphis.close() if __name__ == '__main__': From c6552808965d383d8c0efab7d154cefb7c4564d3 Mon Sep 17 00:00:00 2001 From: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com> Date: Sun, 21 Aug 2022 19:57:43 +0300 Subject: [PATCH 05/16] Update LICENSE.txt --- LICENSE.txt | 686 ++-------------------------------------------------- 1 file changed, 17 insertions(+), 669 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index a5eae15..f8629ea 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,674 +1,22 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +MIT License -Copyright (C) 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. +Copyright (c) 2022 Memphis{dev} - Preamble +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The GNU General Public License is a free, copyleft license for -software and other kinds of works. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +This license limiting reselling the software itself "AS IS". -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - -Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - -Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - -0. Definitions. - -"This License" refers to version 3 of the GNU General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based -on the Program. - -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -1. Source Code. - -The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -11. Patents. - -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - -13. Use with the GNU Affero General Public License. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - -14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - -You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - -The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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. From cdc16ecaa1d36f98b2d38e3dee7d260b3340fe73 Mon Sep 17 00:00:00 2001 From: idanasulinStrech Date: Wed, 24 Aug 2022 15:38:25 +0300 Subject: [PATCH 06/16] update the md files --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 4 +++- README.md | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 5d8f9ca..3d3f7d1 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -125,4 +125,4 @@ enforcement ladder](https://github.com/mozilla/diversity). For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. +https://www.contributor-covenant.org/translations. \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 06a5bf3..ff6a5ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,7 @@ # Contributing +Newer version here + We would ❤️ it if you contributed to the project and helped make Memphis{dev} even better.
We will make sure that contributing to Memphis{dev} is easy, enjoyable, and educational for anyone and everyone.
All contributions are welcome, including features, issues, documentation, guides, and more. @@ -186,4 +188,4 @@ Please note that this project is released with a Contributor Code of Conduct. By [Code of Conduct](https://github.com/memphisdev/memphis-broker/blob/master/code_of_conduct.md) -Our Code of Conduct means that you are responsible for treating everyone on the project with respect and courtesy. +Our Code of Conduct means that you are responsible for treating everyone on the project with respect and courtesy. \ No newline at end of file diff --git a/README.md b/README.md index 0af1b90..c90be60 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,7 @@ async def main(): host="", username="", connection_token="", - management_port="", # defaults to 5555 - tcp_port="", # defaults to 6666 - data_port="", # defaults to 7766 + port="", # defaults to 6666 reconnect=True, # defaults to False max_reconnect=10, # defaults to 10 reconnect_interval_ms=1500, # defaults to 1500 From 683b7fe91a4591367bc3bbc788cd56f4da51fd15 Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Wed, 24 Aug 2022 17:50:23 +0300 Subject: [PATCH 07/16] nats-integration-python-sdk --- memphis/memphis.py | 182 ++++++++++++++++++++++++++++++-------------- memphis/producer.py | 32 ++++++-- setup.py | 6 +- 3 files changed, 156 insertions(+), 64 deletions(-) diff --git a/memphis/memphis.py b/memphis/memphis.py index 03975af..f908671 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -11,22 +11,15 @@ # See the License for the specific language governing permissions and # limitations under the License +import random import socket import json -import time -# import nats as broker - -import sys -sys.path.insert(0, "../memphis-nats.py/") import nats as broker -from nats.errors import TimeoutError import uuid -from http_request import http_request -from threading import Thread, Timer +from threading import Timer import asyncio -# from memphis.http_request import http_request import retention_types import storage_types @@ -51,15 +44,15 @@ def __init__(self): self.client = socket.socket() self.connected = False self.is_connection_active = False - - async def connect(self, host, username, connection_token, management_port=5555, tcp_port=6666, reconnect=True, max_reconnect=10, reconnect_interval_ms=1500, timeout_ms=15000): + + async def connect(self, host, username, connection_token, management_port=5555, port=6666, reconnect=True, max_reconnect=10, reconnect_interval_ms=1500, timeout_ms=15000): """Creates connection with Memphis. Args: host (str): memphis host. username (str): user of type root/application. connection_token (str): broker token. management_port (int, optional): management port. Defaults to 5555. - tcp_port (int, optional): tcp port. Defaults to 6666. + port (int, optional): port. Defaults to 6666. reconnect (bool, optional): whether to do reconnect while connection is lost. Defaults to True. max_reconnect (int, optional): The reconnect attempt. Defaults to 3. reconnect_interval_ms (int, optional): Interval in miliseconds between reconnect attempts. Defaults to 200. @@ -69,31 +62,27 @@ async def connect(self, host, username, connection_token, management_port=5555, self.username = username self.connection_token = connection_token self.management_port = management_port - self.tcp_port = tcp_port + self.port = port self.reconnect = reconnect self.max_reconnect = 9 if max_reconnect > 9 else max_reconnect self.reconnect_interval_ms = reconnect_interval_ms self.timeout_ms = timeout_ms + self.connection_id = self.__generateConnectionID() try: - self.broker_manager = await broker.connect(servers=self.host+":"+str(self.tcp_port), + self.broker_manager = await broker.connect(servers=self.host+":"+str(self.port), allow_reconnect=self.reconnect, reconnect_time_wait=self.reconnect_interval_ms/1000, connect_timeout=self.timeout_ms/1000, - max_reconnect_attempts=self.max_reconnect, user=self.username, - token=self.connection_token) + max_reconnect_attempts=self.max_reconnect, + token=self.connection_token, + name=self.connection_id + "::" + self.username, max_outstanding_pings=1) self.broker_connection = self.broker_manager.jetstream() - timeout = 3 - self.broker_manager.getConnectionId(timeout) + self.is_connection_active = True except Exception as e: raise Exception(e) - - def __handel_reconnect_timeout(self): - if(not self.reconnect or self.reconnect_attempts == self.max_reconnect or not self.is_connection_active): - raise Exception("Connection timeout has reached") - - def factory(self, name, description=""): + async def factory(self, name, description=""): """Creates a factory. Args: name (str): factory name. @@ -107,17 +96,25 @@ def factory(self, name, description=""): try: if not self.is_connection_active: raise Exception("Connection is dead") + createFactoryReq = { + "factory_name": name, + "factory_description": description + } + create_factory_req_bytes = json.dumps(createFactoryReq, indent=2).encode('utf-8') + err_msg = await self.broker_manager.request("$memphis_factory_creations", create_factory_req_bytes) + err_msg = err_msg.data.decode("utf-8") + + if err_msg != "": + raise Exception(err_msg) + return Factory(self, name) - response = http_request("POST", 'http://'+self.host+':' + str(self.management_port)+'/api/factories/createFactory', - headers={"Authorization": "Bearer " + self.access_token}, body_params={"name": name, "description": description}) - return Factory(self, json.loads(response)['name']) except Exception as e: if str(e).find('already exist') != -1: return Factory(self, name.lower()) else: raise Exception(e) - def station(self, name, factory_name, retention_type=retention_types.MAX_MESSAGE_AGE_SECONDS, retention_value=604800, storage_type=storage_types.FILE, replicas=1, dedup_enabled=False, dedup_window_ms=0): + async def station(self, name, factory_name, retention_type=retention_types.MAX_MESSAGE_AGE_SECONDS, retention_value=604800, storage_type=storage_types.FILE, replicas=1, dedup_enabled=False, dedup_window_ms=0): """Creates a station. Args: name (str): station name. @@ -134,9 +131,25 @@ def station(self, name, factory_name, retention_type=retention_types.MAX_MESSAGE try: if not self.is_connection_active: raise Exception("Connection is dead") - response = http_request("POST", 'http://'+self.host+':' + str(self.management_port)+'/api/stations/createStation', headers={"Authorization": "Bearer " + self.access_token}, body_params={ - "name": name, "factory_name": factory_name, "retention_type": retention_type, "retention_value": retention_value, "storage_type": storage_type, "replicas": replicas, "dedup_enabled": dedup_enabled, "dedup_window_in_ms": dedup_window_ms}) - return Station(self, json.loads(response)['name']) + + createStationReq = { + "name": name, + "factory_name": factory_name, + "retention_type": retention_type, + "retention_value": retention_value, + "storage_type": storage_type, + "replicas": replicas, + "dedup_enabled": dedup_enabled, + "dedup_window_in_ms": dedup_window_ms + } + create_station_req_bytes = json.dumps(createStationReq, indent=2).encode('utf-8') + err_msg = await self.broker_manager.request("$memphis_station_creations", create_station_req_bytes) + err_msg = err_msg.data.decode("utf-8") + + if err_msg != "": + raise Exception(err_msg) + return Station(self, name) + except Exception as e: if str(e).find('already exist') != -1: return Station(self, name.lower()) @@ -165,6 +178,11 @@ async def close(self): except: return + def __generateConnectionID(self): + lst = [random.choice('0123456789abcdef') for n in range(24)] + s = "".join(lst) + return s + def __normalize_host(self, host): if (host.startswith("http://")): return host.split("http://")[1] @@ -223,7 +241,7 @@ async def __close(self): else: break - def producer(self, station_name, producer_name): + async def producer(self, station_name, producer_name): """Creates a producer. Args: station_name (str): station name to produce messages into. @@ -237,16 +255,31 @@ def producer(self, station_name, producer_name): try: if not self.is_connection_active: raise Exception("Connection is dead") - - http_request("POST", 'http://'+self.host+':' + str(self.management_port)+'/api/producers/createProducer', headers={"Authorization": "Bearer " + self.access_token}, body_params={ - "name": producer_name, "station_name": station_name, "connection_id": self.connection_id, "producer_type": "application"}) + + createProducerReq = { + "name": producer_name, + "station_name": station_name, + "connection_id": self.connection_id, + "producer_type": "application" + } + create_producer_req_bytes = json.dumps(createProducerReq, indent=2).encode('utf-8') + err_msg = await self.broker_manager.request("$memphis_producer_creations", create_producer_req_bytes) + err_msg = err_msg.data.decode("utf-8") + + if err_msg != "": + raise Exception(err_msg) return Producer(self, producer_name, station_name) + except Exception as e: - raise Exception(e) + if str(e).find('already exist') != -1: + return Producer(self, producer_name.lower(), station_name.lower()) + else: + raise Exception(e) + - def consumer(self, station_name, consumer_name, consumer_group="", pull_interval_ms=1000, batch_size=10, batch_max_time_to_wait_ms=5000, max_ack_time_ms=30000, max_msg_deliveries=10): + async def consumer(self, station_name, consumer_name, consumer_group="", pull_interval_ms=1000, batch_size=10, batch_max_time_to_wait_ms=5000, max_ack_time_ms=30000, max_msg_deliveries=10): """Creates a consumer. - Args: + Args:. station_name (str): station name to consume messages from. consumer_name (str): name for the consumer. consumer_group (str, optional): consumer group name. Defaults to the consumer name. @@ -262,11 +295,30 @@ def consumer(self, station_name, consumer_name, consumer_group="", pull_interval if not self.is_connection_active: raise Exception("Connection is dead") cg = consumer_name if not consumer_group else consumer_group - http_request("POST", 'http://'+self.host+':' + str(self.management_port)+'/api/consumers/createConsumer', headers={"Authorization": "Bearer " + self.access_token}, body_params={ - "name": consumer_name, "station_name": station_name, "connection_id": self.connection_id, "consumer_type": "application", "consumers_group": cg, "max_ack_time_ms": max_ack_time_ms, "max_msg_deliveries": max_msg_deliveries}) + + createConsumerReq = { + 'name': consumer_name, + "station_name": station_name, + "connection_id": self.connection_id, + "consumer_type": 'application', + "consumers_group": consumer_group, + "max_ack_time_ms": max_ack_time_ms, + "max_msg_deliveries": max_msg_deliveries + } + + create_consumer_req_bytes = json.dumps(createConsumerReq, indent=2).encode('utf-8') + err_msg = await self.broker_manager.request("$memphis_consumer_creations", create_consumer_req_bytes) + err_msg = err_msg.data.decode("utf-8") + + if err_msg != "": + raise Exception(err_msg) return Consumer(self, station_name, consumer_name, cg, pull_interval_ms, batch_size, batch_max_time_to_wait_ms, max_ack_time_ms, max_msg_deliveries) + except Exception as e: - raise Exception(e) + if str(e).find('already exist') != -1: + return Consumer(self, station_name, consumer_name, cg, pull_interval_ms, batch_size, batch_max_time_to_wait_ms, max_ack_time_ms, max_msg_deliveries) + else: + raise Exception(e) class Factory: @@ -274,14 +326,18 @@ def __init__(self, connection, name): self.connection = connection self.name = name.lower() - def destroy(self): + async def destroy(self): """Destroy the factory. """ try: - http_request("DELETE", 'http://'+self.connection.host+':'+str(self.connection.management_port)+'/api/factories/removeFactory', headers={ - "Authorization": "Bearer " + self.connection.access_token}, body_params={"factory_name": self.name}) + nameReq = { + "factory_name":self.name + } + factory_name = json.dumps(nameReq, indent=2).encode('utf-8') + await self.connection.broker_connection.publish('$memphis_factory_destructions', factory_name) + except Exception as e: - raise Exception(e) + return class Station: @@ -289,14 +345,18 @@ def __init__(self, connection, name): self.connection = connection self.name = name.lower() - def destroy(self): + async def destroy(self): """Destroy the station. """ try: - http_request("DELETE", 'http://'+self.connection.host+':'+str(self.connection.management_port)+'/api/stations/removeStation', headers={ - "Authorization": "Bearer " + self.connection.access_token}, body_params={"station_name": self.name}) + nameReq = { + "station_name":self.name + } + station_name = json.dumps(nameReq, indent=2).encode('utf-8') + await self.connection.broker_connection.publish('$memphis_station_destructions', station_name) + except Exception as e: - raise Exception(e) + return class Producer: @@ -324,13 +384,18 @@ async def produce(self, message, ack_wait_sec=15): else: raise Exception(e) - def destroy(self): + async def destroy(self): """Destroy the producer. """ try: - http_request("DELETE", 'http://'+self.connection.host+':'+str(self.connection.management_port)+'/api/producers/destroyProducer', headers={ - "Authorization": "Bearer " + self.connection.access_token}, body_params={"name": self.producer_name, "station_name": self.station_name}) - except: + destroyProducerReq = { + "name": self.producer_name, + "station_name":self.station_name + } + producer_name = json.dumps(destroyProducerReq, indent=2).encode('utf-8') + await self.connection.broker_connection.publish('$memphis_producer_destructions', producer_name) + + except Exception as e: return @@ -389,13 +454,18 @@ async def __consume_dlq(self, callback): async def __ping_consumer(self): x = await self.connection.broker_connection.consumer_info(self.station_name, durable=self.consumer_group) - def destroy(self): + async def destroy(self): """Destroy the consumer. """ self.pull_interval_ms = None try: - http_request("DELETE", 'http://'+self.connection.host+':'+str(self.connection.management_port)+'/api/consumers/destroyConsumer', headers={ - "Authorization": "Bearer " + self.connection.access_token}, body_params={"name": self.consumer_name, "station_name": self.station_name}) + destroyConsumerReq = { + "name": self.consumer_name, + "station_name":self.station_name + } + consumer_name = json.dumps(destroyConsumerReq, indent=2).encode('utf-8') + await self.connection.broker_connection.publish('$memphis_consumer_destructions', consumer_name) + except Exception as e: return diff --git a/memphis/producer.py b/memphis/producer.py index b936566..f29200c 100644 --- a/memphis/producer.py +++ b/memphis/producer.py @@ -2,16 +2,38 @@ from memphis import Memphis -#TODO need to move this example to examples directory - need to fix the problems with imports async def main(): + + async def msg_handler(msgs, error): + try: + for msg in msgs: + print("message: ", msg.get_data()) + await msg.ack() + if error: + print(error) + except Exception as e: + print(e) + return + try: memphis = Memphis() await memphis.connect(host="localhost", username="root", connection_token="memphis") - # producer = memphis.producer( - # station_name="sname", producer_name="pname") - # for i in range(100): - # await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) + myfactory = await memphis.factory("shoham_shay_123567891012345") + myStation = await memphis.station("station_shoham12345678911", myfactory.name) + myProducer = await memphis.producer(myStation.name, "producername123") + for i in range(1): + await myProducer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) + myConsumer = await memphis.consumer( + station_name=myStation.name, consumer_name="consumer_name", consumer_group="") + myConsumer.consume(msg_handler) + # Keep your main thread alive so the consumer will keep receiving data + await asyncio.sleep(5) + + await myProducer.destroy() + await myConsumer.destroy() + await myStation.destroy() + await myfactory.destroy() except Exception as e: print("error" ,e) diff --git a/setup.py b/setup.py index 26345b1..1af633b 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,8 @@ keywords=['message broker', 'devtool', 'streaming', 'data'], install_requires=[ 'asyncio', - 'requests' + 'requests', + 'nats-py' ], classifiers=[ 'Development Status :: 4 - Beta', @@ -28,5 +29,4 @@ 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', ], -) - # 'nats-py', +) \ No newline at end of file From f015685a14b1c1e9a9d57ba0d7a68581b02cdb60 Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Wed, 24 Aug 2022 17:58:26 +0300 Subject: [PATCH 08/16] update the producer example --- examples/{full_example.py => producer.py} | 9 ++--- memphis/producer.py | 46 ----------------------- 2 files changed, 4 insertions(+), 51 deletions(-) rename examples/{full_example.py => producer.py} (55%) delete mode 100644 memphis/producer.py diff --git a/examples/full_example.py b/examples/producer.py similarity index 55% rename from examples/full_example.py rename to examples/producer.py index 009c4de..0428d3f 100644 --- a/examples/full_example.py +++ b/examples/producer.py @@ -1,7 +1,6 @@ import asyncio from memphis.memphis import Memphis -# from memphis import Memphis async def main(): @@ -9,10 +8,10 @@ async def main(): memphis = Memphis() await memphis.connect(host="localhost", username="root", connection_token="memphis") - # producer = memphis.producer( - # station_name="", producer_name="") - # for i in range(100): - # await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) + producer = memphis.producer( + station_name="", producer_name="") + for i in range(100): + await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) except Exception as e: print(e) diff --git a/memphis/producer.py b/memphis/producer.py deleted file mode 100644 index f29200c..0000000 --- a/memphis/producer.py +++ /dev/null @@ -1,46 +0,0 @@ -import asyncio - -from memphis import Memphis - -async def main(): - - async def msg_handler(msgs, error): - try: - for msg in msgs: - print("message: ", msg.get_data()) - await msg.ack() - if error: - print(error) - except Exception as e: - print(e) - return - - try: - memphis = Memphis() - await memphis.connect(host="localhost", username="root", connection_token="memphis") - - myfactory = await memphis.factory("shoham_shay_123567891012345") - myStation = await memphis.station("station_shoham12345678911", myfactory.name) - myProducer = await memphis.producer(myStation.name, "producername123") - for i in range(1): - await myProducer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) - myConsumer = await memphis.consumer( - station_name=myStation.name, consumer_name="consumer_name", consumer_group="") - myConsumer.consume(msg_handler) - # Keep your main thread alive so the consumer will keep receiving data - await asyncio.sleep(5) - - await myProducer.destroy() - await myConsumer.destroy() - await myStation.destroy() - await myfactory.destroy() - - except Exception as e: - print("error" ,e) - - # finally: - # await memphis.close() - - -if __name__ == '__main__': - asyncio.run(main()) From 0cd5c2743895c8d759873e2ecfdc878512dd6c22 Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Wed, 24 Aug 2022 18:26:22 +0300 Subject: [PATCH 09/16] revert producer example --- examples/producer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/producer.py b/examples/producer.py index 0428d3f..b2a6dc0 100644 --- a/examples/producer.py +++ b/examples/producer.py @@ -1,6 +1,6 @@ import asyncio -from memphis.memphis import Memphis +from memphis import Memphis async def main(): From 08286a59cfaa115234c23aab36323f8cbc62d07b Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Wed, 24 Aug 2022 18:35:21 +0300 Subject: [PATCH 10/16] revert producer example --- examples/producer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/producer.py b/examples/producer.py index b2a6dc0..74a8a9e 100644 --- a/examples/producer.py +++ b/examples/producer.py @@ -1,12 +1,11 @@ import asyncio - from memphis import Memphis async def main(): try: memphis = Memphis() - await memphis.connect(host="localhost", username="root", connection_token="memphis") + await memphis.connect(host="", username="", connection_token="") producer = memphis.producer( station_name="", producer_name="") @@ -20,4 +19,4 @@ async def main(): await memphis.close() if __name__ == '__main__': - asyncio.run(main()) + asyncio.run(main()) \ No newline at end of file From 03c8d5b2d98d08618489198eade8e99e2245c474 Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Wed, 24 Aug 2022 19:36:18 +0300 Subject: [PATCH 11/16] remove unnecessary fields and methods --- examples/producer.py | 2 +- memphis/memphis.py | 75 ++------------------------------------------ setup.py | 1 - 3 files changed, 4 insertions(+), 74 deletions(-) diff --git a/examples/producer.py b/examples/producer.py index 74a8a9e..042e20d 100644 --- a/examples/producer.py +++ b/examples/producer.py @@ -19,4 +19,4 @@ async def main(): await memphis.close() if __name__ == '__main__': - asyncio.run(main()) \ No newline at end of file + asyncio.run(main()) diff --git a/memphis/memphis.py b/memphis/memphis.py index f908671..90f2ded 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -41,17 +41,14 @@ def cancel(self): class Memphis: def __init__(self): - self.client = socket.socket() - self.connected = False self.is_connection_active = False - async def connect(self, host, username, connection_token, management_port=5555, port=6666, reconnect=True, max_reconnect=10, reconnect_interval_ms=1500, timeout_ms=15000): + async def connect(self, host, username, connection_token, port=6666, reconnect=True, max_reconnect=10, reconnect_interval_ms=1500, timeout_ms=15000): """Creates connection with Memphis. Args: host (str): memphis host. username (str): user of type root/application. connection_token (str): broker token. - management_port (int, optional): management port. Defaults to 5555. port (int, optional): port. Defaults to 6666. reconnect (bool, optional): whether to do reconnect while connection is lost. Defaults to True. max_reconnect (int, optional): The reconnect attempt. Defaults to 3. @@ -61,7 +58,6 @@ async def connect(self, host, username, connection_token, management_port=5555, self.host = self.__normalize_host(host) self.username = username self.connection_token = connection_token - self.management_port = management_port self.port = port self.reconnect = reconnect self.max_reconnect = 9 if max_reconnect > 9 else max_reconnect @@ -163,15 +159,6 @@ async def close(self): if self.is_connection_active: await self.broker_manager.close() self.broker_manager = None - self.client.close() - self.client = None - self.t_keep_acess_token_fresh.cancel() - self.t_ping_server.cancel() - self.t_timeout.cancel() - self.access_token_timeout = None - self.ping_interval_ms = None - self.access_token_exp = None - self.access_token = None self.connection_id = None self.is_connection_active = False self.reconnect_attempts = 0 @@ -191,56 +178,6 @@ def __normalize_host(self, host): else: return host - def __keep_acess_token_fresh(self): - if self.is_connection_active: - self.client.send(json.dumps( - {"resend_access_token": True}).encode()) - data = self.client.recv(1024) - try: - data = json.loads(data) - if data['access_token']: - self.access_token = data['access_token'] - except: - raise Exception(data) - - def __ping_server(self): - if self.is_connection_active: - self.client.send(json.dumps( - {"ping": True}).encode()) - data = self.client.recv(1024) - try: - data = json.loads(data) - if data['ping_interval_ms']: - self.ping_interval_ms = data['ping_interval_ms'] - except: - raise Exception(data) - - async def __close(self): - if self.reconnect is True: - while self.reconnect_attempts < self.max_reconnect: - self.reconnect_attempts += 1 - try: - await self.connect(host=self.host, management_port=self.management_port, tcp_port=self.tcp_port, username=self.username, connection_token=self.connection_token, reconnect=self.reconnect, max_reconnect=self.max_reconnect, reconnect_interval_ms=self.reconnect_interval_ms, timeout_ms=self.timeout_ms) - print("Reconnect to memphis has been succeeded") - return - except Exception as e: - print("Failed reconnect to memphis") - await asyncio.sleep(self.reconnect_interval_ms/1000) - if self.reconnect is False or self.reconnect_attempts >= self.max_reconnect: - if self.is_connection_active is True: - self.client.destroy() - self.connected = False - self.t_keep_acess_token_fresh.cancel() - self.t_ping_server.cancel() - self.t_timeout.cancel() - self.is_connection_active = False - while True: - if self.broker_manager: - self.broker_manager.close() - await asyncio.sleep(0.5) - else: - break - async def producer(self, station_name, producer_name): """Creates a producer. Args: @@ -271,10 +208,7 @@ async def producer(self, station_name, producer_name): return Producer(self, producer_name, station_name) except Exception as e: - if str(e).find('already exist') != -1: - return Producer(self, producer_name.lower(), station_name.lower()) - else: - raise Exception(e) + raise Exception(e) async def consumer(self, station_name, consumer_name, consumer_group="", pull_interval_ms=1000, batch_size=10, batch_max_time_to_wait_ms=5000, max_ack_time_ms=30000, max_msg_deliveries=10): @@ -315,10 +249,7 @@ async def consumer(self, station_name, consumer_name, consumer_group="", pull_in return Consumer(self, station_name, consumer_name, cg, pull_interval_ms, batch_size, batch_max_time_to_wait_ms, max_ack_time_ms, max_msg_deliveries) except Exception as e: - if str(e).find('already exist') != -1: - return Consumer(self, station_name, consumer_name, cg, pull_interval_ms, batch_size, batch_max_time_to_wait_ms, max_ack_time_ms, max_msg_deliveries) - else: - raise Exception(e) + raise Exception(e) class Factory: diff --git a/setup.py b/setup.py index 1af633b..b3d5b3b 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ keywords=['message broker', 'devtool', 'streaming', 'data'], install_requires=[ 'asyncio', - 'requests', 'nats-py' ], classifiers=[ From f3ebbd5eff9347cf1b145f23c8b8fa2b1345906d Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Wed, 24 Aug 2022 19:55:06 +0300 Subject: [PATCH 12/16] add an exception in destroy methods --- memphis/memphis.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/memphis/memphis.py b/memphis/memphis.py index 90f2ded..0e82d4b 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -161,7 +161,6 @@ async def close(self): self.broker_manager = None self.connection_id = None self.is_connection_active = False - self.reconnect_attempts = 0 except: return @@ -268,7 +267,8 @@ async def destroy(self): await self.connection.broker_connection.publish('$memphis_factory_destructions', factory_name) except Exception as e: - return + raise Exception(e) + class Station: @@ -287,7 +287,7 @@ async def destroy(self): await self.connection.broker_connection.publish('$memphis_station_destructions', station_name) except Exception as e: - return + raise Exception(e) class Producer: @@ -327,7 +327,7 @@ async def destroy(self): await self.connection.broker_connection.publish('$memphis_producer_destructions', producer_name) except Exception as e: - return + raise Exception(e) class Consumer: @@ -398,7 +398,7 @@ async def destroy(self): await self.connection.broker_connection.publish('$memphis_consumer_destructions', consumer_name) except Exception as e: - return + raise Exception(e) class Message: From d615291f32beb15b04baf4b6778da48c0eb03e10 Mon Sep 17 00:00:00 2001 From: idanasulinStrech Date: Thu, 25 Aug 2022 11:29:09 +0300 Subject: [PATCH 13/16] update license headers + code examples --- README.md | 4 ++-- examples/consumer.py | 2 +- examples/producer.py | 2 +- memphis/__init__.py | 28 ++++++++++++++++--------- memphis/http_request.py | 43 -------------------------------------- memphis/memphis.py | 32 +++++++++++++++++----------- memphis/retention_types.py | 28 ++++++++++++++++--------- memphis/storage_types.py | 32 +++++++++++++++++----------- 8 files changed, 80 insertions(+), 91 deletions(-) delete mode 100644 memphis/http_request.py diff --git a/README.md b/README.md index c90be60..9006f27 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ of whether there are messages in flight for the client. ### Creating a Producer ```python -producer = memphis.producer(station_name="", producer_name="") +producer = await memphis.producer(station_name="", producer_name="") ``` ### Producing a message @@ -188,7 +188,7 @@ producer.destroy() ### Creating a Consumer ```python -consumer = memphis.consumer( +consumer = await memphis.consumer( station_name="", consumer_name="", consumer_group="", # defaults to the consumer name diff --git a/examples/consumer.py b/examples/consumer.py index 54ab419..d702878 100644 --- a/examples/consumer.py +++ b/examples/consumer.py @@ -18,7 +18,7 @@ async def msg_handler(msgs, error): memphis = Memphis() await memphis.connect(host="", username="", connection_token="") - consumer = memphis.consumer( + consumer = await memphis.consumer( station_name="", consumer_name="", consumer_group="") consumer.consume(msg_handler) # Keep your main thread alive so the consumer will keep receiving data diff --git a/examples/producer.py b/examples/producer.py index 042e20d..b9b5386 100644 --- a/examples/producer.py +++ b/examples/producer.py @@ -7,7 +7,7 @@ async def main(): memphis = Memphis() await memphis.connect(host="", username="", connection_token="") - producer = memphis.producer( + producer = await memphis.producer( station_name="", producer_name="") for i in range(100): await producer.produce(bytearray('Message #'+str(i)+': Hello world', 'utf-8')) diff --git a/memphis/__init__.py b/memphis/__init__.py index 6193199..1b59738 100644 --- a/memphis/__init__.py +++ b/memphis/__init__.py @@ -1,15 +1,23 @@ -# Copyright 2021-2022 The Memphis Authors -# Licensed under the Apache License, Version 2.0 (the “License”); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# Copyright 2021-2022 The Memphis Authors +# Licensed under the MIT License (the "License"); +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: -# http://www.apache.org/licenses/LICENSE-2.0 +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an “AS IS” BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License +# This license limiting reselling the software itself "AS IS". + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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. from memphis.memphis import Memphis import memphis.retention_types diff --git a/memphis/http_request.py b/memphis/http_request.py deleted file mode 100644 index 851409a..0000000 --- a/memphis/http_request.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2021-2022 The Memphis Authors -# Licensed under the Apache License, Version 2.0 (the “License”); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an “AS IS” BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License - -import requests -import json - - -def http_request(method, url, headers={}, body_params={}, query_params={}, file=None, timeout=None): - if method != 'GET' and method != 'POST' and method != 'PUT' and method != 'DELETE': - raise Exception( - {"status": 400, "message": "Invalid HTTP method", "data": {method, url, body_params}}) - if file: - body_params['file'] = file - - headers['content-type'] = 'application/json' - try: - typeOfMethod = { - "GET": requests.get(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)), - "POST": requests.post(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)), - 'PUT': requests.put(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)), - 'DELETE': requests.delete(url, headers=headers, timeout=timeout, - data=json.dumps(body_params), params=json.dumps(query_params)) - } - response = typeOfMethod.get(method) - if response.status_code != 200: - raise Exception(response.text) - else: - return response.text - except Exception as e: - raise Exception(e) diff --git a/memphis/memphis.py b/memphis/memphis.py index 0e82d4b..94d7a3a 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -1,15 +1,23 @@ -# Copyright 2021-2022 The Memphis Authors -# Licensed under the Apache License, Version 2.0 (the “License”); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an “AS IS” BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License +# Copyright 2021-2022 The Memphis Authors +# Licensed under the MIT License (the "License"); +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# This license limiting reselling the software itself "AS IS". + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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 random import socket diff --git a/memphis/retention_types.py b/memphis/retention_types.py index 82e8bd3..2f7b79e 100644 --- a/memphis/retention_types.py +++ b/memphis/retention_types.py @@ -1,15 +1,23 @@ -# Copyright 2021-2022 The Memphis Authors -# Licensed under the Apache License, Version 2.0 (the “License”); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# Copyright 2021-2022 The Memphis Authors +# Licensed under the MIT License (the "License"); +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: -# http://www.apache.org/licenses/LICENSE-2.0 +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an “AS IS” BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License +# This license limiting reselling the software itself "AS IS". + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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. MAX_MESSAGE_AGE_SECONDS = "message_age_sec" MESSAGES = "messages" diff --git a/memphis/storage_types.py b/memphis/storage_types.py index ecb985e..b1e146c 100644 --- a/memphis/storage_types.py +++ b/memphis/storage_types.py @@ -1,15 +1,23 @@ -# Copyright 2021-2022 The Memphis Authors -# Licensed under the Apache License, Version 2.0 (the “License”); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an “AS IS” BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License +# Copyright 2021-2022 The Memphis Authors +# Licensed under the MIT License (the "License"); +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# This license limiting reselling the software itself "AS IS". + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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. FILE = "file" MEMORY = "memory" From 753477134aaf58702429402e30e7f1b1010662b2 Mon Sep 17 00:00:00 2001 From: idanasulinStrech Date: Thu, 25 Aug 2022 14:00:06 +0300 Subject: [PATCH 14/16] readme update --- README.md | 4 ++-- memphis/memphis.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9006f27..3b43d64 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ async def main(): username="", connection_token="", port="", # defaults to 6666 - reconnect=True, # defaults to False - max_reconnect=10, # defaults to 10 + reconnect=True, # defaults to True + max_reconnect=3, # defaults to 3 reconnect_interval_ms=1500, # defaults to 1500 timeout_ms=1500 # defaults to 1500 ) diff --git a/memphis/memphis.py b/memphis/memphis.py index 94d7a3a..85ef4a5 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -20,7 +20,6 @@ # SOFTWARE. import random -import socket import json import nats as broker From 1c790ffc334980ec3478e3e00eb19fa36f060723 Mon Sep 17 00:00:00 2001 From: shohamroditimemphis Date: Sun, 28 Aug 2022 02:22:43 +0300 Subject: [PATCH 15/16] change the publish to request in destroy methods --- memphis/memphis.py | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/memphis/memphis.py b/memphis/memphis.py index 0e82d4b..1e400f9 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -21,8 +21,8 @@ from threading import Timer import asyncio -import retention_types -import storage_types +import memphis.retention_types as retention_types +import memphis.storage_types as storage_types class set_interval(): @@ -264,8 +264,12 @@ async def destroy(self): "factory_name":self.name } factory_name = json.dumps(nameReq, indent=2).encode('utf-8') - await self.connection.broker_connection.publish('$memphis_factory_destructions', factory_name) - + res = await self.connection.broker_manager.request('$memphis_factory_destructions', factory_name) + error = res.data.decode('utf-8') + if "mongo: no documents in result" in error: + print('Producer already destroyed') + elif error != "": + raise Exception(error) except Exception as e: raise Exception(e) @@ -284,7 +288,12 @@ async def destroy(self): "station_name":self.name } station_name = json.dumps(nameReq, indent=2).encode('utf-8') - await self.connection.broker_connection.publish('$memphis_station_destructions', station_name) + res = await self.connection.broker_manager.request('$memphis_station_destructions', station_name) + error = res.data.decode('utf-8') + if "mongo: no documents in result" in error: + print('Producer already destroyed') + elif error != "": + raise Exception(error) except Exception as e: raise Exception(e) @@ -321,11 +330,16 @@ async def destroy(self): try: destroyProducerReq = { "name": self.producer_name, - "station_name":self.station_name + "station_name": self.station_name } - producer_name = json.dumps(destroyProducerReq, indent=2).encode('utf-8') - await self.connection.broker_connection.publish('$memphis_producer_destructions', producer_name) - + + producer_name = json.dumps(destroyProducerReq).encode('utf-8') + res = await self.connection.broker_manager.request('$memphis_producer_destructions', producer_name) + error = res.data.decode('utf-8') + if "mongo: no documents in result" in error: + print('Producer already destroyed') + elif error != "": + raise Exception(error) except Exception as e: raise Exception(e) @@ -395,7 +409,12 @@ async def destroy(self): "station_name":self.station_name } consumer_name = json.dumps(destroyConsumerReq, indent=2).encode('utf-8') - await self.connection.broker_connection.publish('$memphis_consumer_destructions', consumer_name) + res = await self.connection.broker_manager.request('$memphis_consumer_destructions', consumer_name) + error = res.data.decode('utf-8') + if "mongo: no documents in result" in error: + print('Producer already destroyed') + elif error != "": + raise Exception(error) except Exception as e: raise Exception(e) From 7f67e0b03a8e938f06a9fb707af8984a704eceab Mon Sep 17 00:00:00 2001 From: shay23b Date: Sun, 28 Aug 2022 10:43:50 +0300 Subject: [PATCH 16/16] changed destroy exception --- memphis/memphis.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/memphis/memphis.py b/memphis/memphis.py index 1e400f9..4f3afc2 100644 --- a/memphis/memphis.py +++ b/memphis/memphis.py @@ -266,9 +266,7 @@ async def destroy(self): factory_name = json.dumps(nameReq, indent=2).encode('utf-8') res = await self.connection.broker_manager.request('$memphis_factory_destructions', factory_name) error = res.data.decode('utf-8') - if "mongo: no documents in result" in error: - print('Producer already destroyed') - elif error != "": + if error != "" and not "not exist" in error: raise Exception(error) except Exception as e: raise Exception(e) @@ -290,11 +288,8 @@ async def destroy(self): station_name = json.dumps(nameReq, indent=2).encode('utf-8') res = await self.connection.broker_manager.request('$memphis_station_destructions', station_name) error = res.data.decode('utf-8') - if "mongo: no documents in result" in error: - print('Producer already destroyed') - elif error != "": + if error != "" and not "not exist" in error: raise Exception(error) - except Exception as e: raise Exception(e) @@ -336,9 +331,7 @@ async def destroy(self): producer_name = json.dumps(destroyProducerReq).encode('utf-8') res = await self.connection.broker_manager.request('$memphis_producer_destructions', producer_name) error = res.data.decode('utf-8') - if "mongo: no documents in result" in error: - print('Producer already destroyed') - elif error != "": + if error != "" and not "not exist" in error: raise Exception(error) except Exception as e: raise Exception(e) @@ -411,11 +404,8 @@ async def destroy(self): consumer_name = json.dumps(destroyConsumerReq, indent=2).encode('utf-8') res = await self.connection.broker_manager.request('$memphis_consumer_destructions', consumer_name) error = res.data.decode('utf-8') - if "mongo: no documents in result" in error: - print('Producer already destroyed') - elif error != "": + if error != "" and not "not exist" in error: raise Exception(error) - except Exception as e: raise Exception(e)